aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/edit
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-08-21 16:00:48 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-08-21 16:00:48 -0500
commit2c79dbc5ffb249cfaf5ae11fc8565bc7f4256e09 (patch)
treed9f10b76aed8c9ba544a0f5af3c4e49981cc3329 /mediagoblin/edit
parent0cdebda7fc533384bd725412365325edcbeb038c (diff)
parenta30d2d8b6ca0837737e92b09bac74c4504ba0182 (diff)
downloadmediagoblin-2c79dbc5ffb249cfaf5ae11fc8565bc7f4256e09.tar.lz
mediagoblin-2c79dbc5ffb249cfaf5ae11fc8565bc7f4256e09.tar.xz
mediagoblin-2c79dbc5ffb249cfaf5ae11fc8565bc7f4256e09.zip
Merge remote-tracking branch 'refs/remotes/rodney757/notifications'
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