Skip to content
Snippets Groups Projects
Commit 88bf96c8 authored by Hangzhi Yu's avatar Hangzhi Yu
Browse files

Use dynamic-preferences instead of constance for recipient e-mail address

Default to first admin email

Revert whitespace
parent f461f5f6
No related branches found
No related tags found
1 merge request!15Resolve "Fix preferences for mail"
from django import forms
from django.utils.translation import gettext_lazy as _
from dynamic_preferences.types import StringPreference
from dynamic_preferences.preferences import Section
from aleksis.core.registries import site_preferences_registry
from aleksis.core.settings import ADMINS as admins
hjelp = Section("hjelp")
@site_preferences_registry.register
class FAQRecipient(StringPreference):
field_class = forms.EmailField
section = hjelp
name = "faq_recipient"
default = admins[0].email
required = False
verbose_name = _("Recipient e-mail address for FAQ questions")
@site_preferences_registry.register
class IssueReportRecipient(StringPreference):
field_class = forms.EmailField
section = hjelp
name = "issue_report_recipient"
default = admins[0].email
required = False
verbose_name = _("Recipient e-mail address for issue reports")
@site_preferences_registry.register
class FeedbackRecipient(StringPreference):
field_class = forms.EmailField
section = hjelp
name = "feedback_recipient"
default = admins[0].email
required = False
verbose_name = _("Recipient e-mail address for feedback")
......@@ -5,10 +5,10 @@ from django.utils.translation import ugettext_lazy as _
from .models import FAQSection, FAQQuestion, IssueCategory
from .forms import FAQForm, IssueForm, FeedbackForm
from constance import config
from templated_email import send_templated_mail
from aleksis.core.models import Activity
from aleksis.core.util.core_helpers import get_site_preferences
def faq(request):
......@@ -41,7 +41,7 @@ def ask_faq(request):
send_templated_mail(
template_name="hjelp",
from_email=f"{request.user.get_full_name()} <{request.user.email}>",
recipient_list=[config.MAIL_QUESTIONS],
recipient_list=[get_site_preferences()["hjelp__faq_recipient"]],
context=context,
)
......@@ -117,7 +117,7 @@ def rebus(request):
send_templated_mail(
template_name="hjelp",
from_email=f"{request.user.get_full_name()} <{request.user.email}>",
recipient_list=[config.MAIL_REBUS],
recipient_list=[get_site_preferences()["hjelp__issue_report_recipient"]],
context=context,
)
......@@ -161,7 +161,7 @@ def feedback(request):
send_templated_mail(
template_name="hjelp",
from_email=f"{request.user.get_full_name()} <{request.user.email}>",
recipient_list=[config.MAIL_FEEDBACK],
recipient_list=[get_site_preferences()["hjelp__feedback_recipient"]],
context=context,
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment