aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/edit
diff options
context:
space:
mode:
authorAditi <aditi.iitr@gmail.com>2013-08-25 09:24:13 +0530
committerAditi <aditi.iitr@gmail.com>2013-08-25 09:24:13 +0530
commit7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6 (patch)
tree32f715388cb985b0de84c6c502e7ec98d7f0d885 /mediagoblin/edit
parent70cc6eb8f383dcc97aeac22216a9da0d65a09085 (diff)
parente8eec575f3a1d893036ce9b3356d2f56fd15016d (diff)
downloadmediagoblin-7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6.tar.lz
mediagoblin-7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6.tar.xz
mediagoblin-7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6.zip
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/edit')
-rw-r--r--mediagoblin/edit/forms.py2
-rw-r--r--mediagoblin/edit/views.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index 85c243a0..5de1bf96 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -67,6 +67,8 @@ class EditAccountForm(wtforms.Form):
normalize_user_or_email_field(allow_user=False)])
wants_comment_notification = wtforms.BooleanField(
description=_("Email me when others comment on my media"))
+ wants_notifications = wtforms.BooleanField(
+ description=_("Enable/Disable insite notifications"))
license_preference = wtforms.SelectField(
_('License preference'),
[
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 6aa2acd9..a11cb932 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -228,10 +228,12 @@ def edit_account(request):
user = request.user
form = forms.EditAccountForm(request.form,
wants_comment_notification=user.wants_comment_notification,
- license_preference=user.license_preference)
+ license_preference=user.license_preference,
+ wants_notifications=user.wants_notifications)
if request.method == 'POST' and form.validate():
user.wants_comment_notification = form.wants_comment_notification.data
+ user.wants_notifications = form.wants_notifications.data
user.license_preference = form.license_preference.data