diff options
| author | Aditi Mittal <aditi.iitr@gmail.com> | 2013-09-05 22:45:10 +0530 |
|---|---|---|
| committer | Aditi Mittal <aditi.iitr@gmail.com> | 2013-09-05 22:45:10 +0530 |
| commit | f242807518a3cf079dac86d48dd3c19fc985993e (patch) | |
| tree | 4d52f1fc30e97ee5ee3ae61e004e9e8f2d196bbf /mediagoblin/edit | |
| parent | 1d9d9f1c9a7bd1d0313dfffe80286a258420c9e6 (diff) | |
| parent | 85cf52f86548dfbc8a65a8c1625de9539a3ea9b6 (diff) | |
| download | mediagoblin-f242807518a3cf079dac86d48dd3c19fc985993e.tar.lz mediagoblin-f242807518a3cf079dac86d48dd3c19fc985993e.tar.xz mediagoblin-f242807518a3cf079dac86d48dd3c19fc985993e.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/edit')
| -rw-r--r-- | mediagoblin/edit/forms.py | 2 | ||||
| -rw-r--r-- | mediagoblin/edit/views.py | 18 |
2 files changed, 8 insertions, 12 deletions
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py index 3f1e2386..388940b4 100644 --- a/mediagoblin/edit/forms.py +++ b/mediagoblin/edit/forms.py @@ -64,7 +64,7 @@ class EditAccountForm(wtforms.Form): wants_comment_notification = wtforms.BooleanField( description=_("Email me when others comment on my media")) wants_notifications = wtforms.BooleanField( - description=_("Enable/Disable insite notifications")) + description=_("Enable insite notifications about events.")) license_preference = wtforms.SelectField( _('License preference'), [ diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index b09f8c5e..be19bcda 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -237,17 +237,13 @@ def edit_account(request): user.license_preference = form.license_preference.data - if form.new_email.data: - _update_email(request, form, user) - - if not form.errors: - user.save() - messages.add_message(request, - messages.SUCCESS, - _("Account settings saved")) - return redirect(request, - 'mediagoblin.user_pages.user_home', - user=user.username) + user.save() + messages.add_message(request, + messages.SUCCESS, + _("Account settings saved")) + return redirect(request, + 'mediagoblin.user_pages.user_home', + user=user.username) return render_to_response( request, |