Merge remote-tracking branch 'is_derek/bug405_email_notifications_for_comments' into notifications-merge

Conflicts:
	mediagoblin/db/mongo/migrations.py

mediagoblin/edit/forms.py

@@ -61,14 +61,15 @@ class EditProfileForm(wtforms.Form):
 class EditAccountForm(wtforms.Form):
     old_password = wtforms.PasswordField(
         _('Old password'),
-        [wtforms.validators.Required()],
         description=_(
             "Enter your old password to prove you own this account."))
     new_password = wtforms.PasswordField(
         _('New password'),
-        [wtforms.validators.Required(),
-         wtforms.validators.Length(min=6, max=30)],
+        [wtforms.validators.Length(min=6, max=30)],
         id="password")
+    wants_comment_notification = wtforms.BooleanField(
+        _('Comment notification?'),
+        description=_("Check this box to be emailed when someone else comments on your media."))
 
 
 class EditAttachmentsForm(wtforms.Form):

mediagoblin/edit/views.py

@@ -181,39 +181,50 @@ def edit_profile(request):
 @require_active_login
 def edit_account(request):
     user = request.user
+    form = forms.EditAccountForm(request.POST,
+        wants_comment_notification=user.get('wants_comment_notification'))
 
-    form = forms.EditAccountForm(request.POST)
+    if request.method == 'POST':
+        form_validated = form.validate()
 
-    if request.method == 'POST' and form.validate():
-        password_matches = auth_lib.bcrypt_check_password(
-            request.POST['old_password'],
-            user.pw_hash)
+        #if the user has not filled in the new or old password fields
+        if not form.new_password.data and not form.old_password.data:
+            if form.wants_comment_notification.validate(form):
+                user.wants_comment_notification = \
+                    form.wants_comment_notification.data
+                user.save()
+                messages.add_message(request,
+                    messages.SUCCESS,
+                    _("Account settings saved"))
+                return redirect(request,
+                                'mediagoblin.user_pages.user_home',
+                                user=user.username)
 
-        if (request.POST['old_password'] or request.POST['new_password']) and not \
-                password_matches:
-            form.old_password.errors.append(_('Wrong password'))
-
-            return render_to_response(
-                request,
-                'mediagoblin/edit/edit_account.html',
-                {'user': user,
-                 'form': form})
-
-        if password_matches:
-            user.pw_hash = auth_lib.bcrypt_gen_password_hash(
-                request.POST['new_password'])
-
-        user.save()
-
-        messages.add_message(request,
-                             messages.SUCCESS,
-                             _("Account settings saved"))
-        return redirect(request,
-                       'mediagoblin.user_pages.user_home',
-                        user=user.username)
+        #so the user has filled in one or both of the password fields
+        else:
+            if form_validated:
+                password_matches = auth_lib.bcrypt_check_password(
+                    form.old_password.data,
+                    user.pw_hash)
+                if password_matches:
+                    #the entire form validates and the password matches
+                    user.pw_hash = auth_lib.bcrypt_gen_password_hash(
+                        form.new_password.data)
+                    user.wants_comment_notification = \
+                        form.wants_comment_notification.data
+                    user.save()
+                    messages.add_message(request,
+                        messages.SUCCESS,
+                        _("Account settings saved"))
+                    return redirect(request,
+                                    'mediagoblin.user_pages.user_home',
+                                    user=user.username)
+                else:
+                    form.old_password.errors.append(_('Wrong password'))
 
     return render_to_response(
         request,
         'mediagoblin/edit/edit_account.html',
         {'user': user,
          'form': form})
+