merge notification-config -> trunk, previous commits 694, 695, 702

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

diff --git a/forum/forms/auth.py b/forum/forms/auth.py
index c1a7c0914f6d5d05372f079247222d43ade4feaa..9bf2d671e40bbf7e2158e01145c2382066be73c2 100644 (file)
--- a/forum/forms/auth.py
+++ b/forum/forms/auth.py
@@ -1,6 +1,5 @@
 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
@@ -35,17 +34,6 @@ class TemporaryLoginRequestForm(forms.Form):
         self.user_cache = users
         return self.cleaned_data['email']
 
-
-class SimpleEmailSubscribeForm(forms.Form):
-    SIMPLE_SUBSCRIBE_CHOICES = (
-        ('y',_('okay, let\'s try!')),
-        ('n',_('no OSQA community email please, thanks'))
-    )
-    subscribe = forms.ChoiceField(widget=forms.widgets.RadioSelect(), \
-                                error_messages={'required':_('please choose one of the options above')},
-                                choices=SIMPLE_SUBSCRIBE_CHOICES, initial=INITIAL_EMAIL_SUBSCRIBE_OPTION)
-
-
 class ChangePasswordForm(SetPasswordForm):
     """ change password form """
     oldpw = forms.CharField(widget=forms.PasswordInput(attrs={'class':'required'}),

diff --git a/forum/views/auth.py b/forum/views/auth.py
index 38243ed191cdd51324310edd9d717db23812481a..db8cc325ec58eb00b1d74ecdf9e21b73efac3f60 100644 (file)
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -19,8 +19,8 @@ import types
 import datetime
 import logging
 
-from forum.forms import SimpleRegistrationForm, SimpleEmailSubscribeForm, \
-        TemporaryLoginRequestForm, ChangePasswordForm, SetPasswordForm
+from forum.forms import SimpleRegistrationForm, TemporaryLoginRequestForm, \
+        ChangePasswordForm, SetPasswordForm
 from forum.utils.mail import send_template_email
 
 from forum.authentication.base import InvalidAuthentication
@@ -156,9 +156,8 @@ def process_provider_signin(request, provider):
 def external_register(request):
     if request.method == 'POST' and 'bnewaccount' in request.POST:
         form1 = SimpleRegistrationForm(request.POST)
-        email_feeds_form = SimpleEmailSubscribeForm(request.POST)
 
-        if (form1.is_valid() and email_feeds_form.is_valid()):
+        if form1.is_valid():
             user_ = User(username=form1.cleaned_data['username'], email=form1.cleaned_data['email'])
             user_.email_isvalid = request.session.get('auth_validated_email', '') == form1.cleaned_data['email']
             user_.set_unusable_password()
@@ -184,10 +183,6 @@ def external_register(request):
             uassoc = AuthKeyUserAssociation(user=user_, key=assoc_key, provider=auth_provider)
             uassoc.save()
 
-            if email_feeds_form.cleaned_data['subscribe'] == 'n':
-                user_.subscription_settings.enable_notifications = False
-                user_.subscription_settings.save()
-
             del request.session['assoc_key']
             del request.session['auth_provider']
 
@@ -218,13 +213,11 @@ def external_register(request):
         'username': username,
         'email': email,
         })
-        email_feeds_form = SimpleEmailSubscribeForm()
 
     provider_context = AUTH_PROVIDERS[request.session['auth_provider']].context
 
     return render_to_response('auth/complete.html', {
     'form1': form1,
-    'email_feeds_form': email_feeds_form,
     'provider':provider_context and mark_safe(provider_context.human_name) or _('unknown'),
     'login_type':provider_context.id,
     'gravatar_faq_url':reverse('faq') + '#gravatar',

diff --git a/forum/views/users.py b/forum/views/users.py
index 50c295fcb77c9b9ad01ca25a27f7313b0552e801..e8f141c424001b96e745a3c7073ba5db8b88a121 100644 (file)
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -368,7 +368,7 @@ def user_favorites(request, user):
 \r
 @user_view('users/subscriptions.html', 'subscriptions', _('subscription'), _('subscriptions'), True, tabbed=False)\r
 def user_subscriptions(request, user):\r
-    enabled = user.subscription_settings.enable_notifications\r
+    enabled = True\r
 \r
     tab = request.GET.get('tab', "settings")\r
 \r
@@ -382,14 +382,6 @@ def user_subscriptions(request, user):
                 form.save()\r
                 message = _('New subscription settings are now saved')\r
 \r
-                if 'notswitch' in request.POST:\r
-                    enabled = not enabled\r
-\r
-                    if enabled:\r
-                        message = _('Notifications are now enabled')\r
-                    else:\r
-                        message = _('Notifications are now disabled')\r
-\r
                 user.subscription_settings.enable_notifications = enabled\r
                 user.subscription_settings.save()\r
 \r

diff --git a/forum_modules/localauth/views.py b/forum_modules/localauth/views.py
index e1daff3e7b87b8bb551a36207ed21743ec869596..2fcee22198794ccaa1a7e14b3e29dd1c75ed2936 100644 (file)
--- a/forum_modules/localauth/views.py
+++ b/forum_modules/localauth/views.py
@@ -4,16 +4,14 @@ from django.template import RequestContext
 from django.utils.translation import ugettext as _
 
 from forms import ClassicRegisterForm
-from forum.forms import SimpleEmailSubscribeForm
 from forum.views.auth import login_and_forward
 from forum.actions import UserJoinsAction
 
 def register(request):
     if request.method == 'POST':
         form = ClassicRegisterForm(request.POST)
-        email_feeds_form = SimpleEmailSubscribeForm(request.POST)
 
-        if form.is_valid() and email_feeds_form.is_valid():
+        if form.is_valid():
             username = form.cleaned_data['username']
             password = form.cleaned_data['password1']
             email = form.cleaned_data['email']
@@ -28,16 +26,10 @@ def register(request):
             user_.save()
             UserJoinsAction(user=user_, ip=request.META['REMOTE_ADDR']).save()
 
-            if email_feeds_form.cleaned_data['subscribe'] == 'n':
-                user_.subscription_settings.enable_notifications = False
-                user_.subscription_settings.save()
-
             return login_and_forward(request, user_, None, _("A welcome email has been sent to your email address. "))
     else:
         form = ClassicRegisterForm(initial={'next':'/'})
-        email_feeds_form = SimpleEmailSubscribeForm()
 
     return render_to_response('auth/complete.html', {
-        'form1': form,
-        'email_feeds_form': email_feeds_form
-        }, context_instance=RequestContext(request))
\ No newline at end of file
+        'form1': form
+        }, context_instance=RequestContext(request))