From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Mon, 3 Jan 2011 19:28:37 +0000 (+0000)
Subject: Making the default email subscription option on the register page configurable from... 
X-Git-Tag: live~471
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/65f6c0b27a2f422e3e61870b84f73f4b2908d147

Making the default email subscription option on the register page configurable from administration on the Email settings page. Jira OSQA #139.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@663 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/forms/auth.py b/forum/forms/auth.py
index cb88ac2..c1a7c09 100644
--- a/forum/forms/auth.py
+++ b/forum/forms/auth.py
@@ -1,5 +1,6 @@
 from general import NextUrlField,  UserNameField,  UserEmailField, SetPasswordForm
 from forum.models import Question, User
+from forum.settings import INITIAL_EMAIL_SUBSCRIBE_OPTION
 from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
@@ -42,7 +43,7 @@ class SimpleEmailSubscribeForm(forms.Form):
     )
     subscribe = forms.ChoiceField(widget=forms.widgets.RadioSelect(), \
                                 error_messages={'required':_('please choose one of the options above')},
-                                choices=SIMPLE_SUBSCRIBE_CHOICES)
+                                choices=SIMPLE_SUBSCRIBE_CHOICES, initial=INITIAL_EMAIL_SUBSCRIBE_OPTION)
 
 
 class ChangePasswordForm(SetPasswordForm):
diff --git a/forum/settings/email.py b/forum/settings/email.py
index ea96940..2a46e29 100644
--- a/forum/settings/email.py
+++ b/forum/settings/email.py
@@ -1,9 +1,22 @@
 from base import Setting, SettingSet
 from django.utils.translation import ugettext_lazy as _
 from django.forms.widgets import PasswordInput
+from django.forms.widgets import RadioSelect
 
 EMAIL_SET = SettingSet('email', _('Email settings'), _("Email server and other email related settings."), 50)
 
+EMAIL_SUBSCRIBE_CHOICES = (
+    ('y', _('Users are subscribed by default')),
+    ('n', _('Users are not subscribed by default')),
+)
+
+INITIAL_EMAIL_SUBSCRIBE_OPTION = Setting('INITIAL_EMAIL_SUBSCRIBE_OPTION', 'y', EMAIL_SET, dict(
+label = _("Default email subscription "),
+widget=RadioSelect,
+choices=EMAIL_SUBSCRIBE_CHOICES,
+help_text = _("Choose what should be the default email subscription status while registering."),
+required=False))
+
 EMAIL_HOST = Setting('EMAIL_HOST', '', EMAIL_SET, dict(
 label = _("Email Server"),
 help_text = _("The SMTP server through which your application will be sending emails."),