aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/edit/views.py
diff options
context:
space:
mode:
authorAditi Mittal <aditi.iitr@gmail.com>2013-09-05 22:45:10 +0530
committerAditi Mittal <aditi.iitr@gmail.com>2013-09-05 22:45:10 +0530
commitf242807518a3cf079dac86d48dd3c19fc985993e (patch)
tree4d52f1fc30e97ee5ee3ae61e004e9e8f2d196bbf /mediagoblin/edit/views.py
parent1d9d9f1c9a7bd1d0313dfffe80286a258420c9e6 (diff)
parent85cf52f86548dfbc8a65a8c1625de9539a3ea9b6 (diff)
downloadmediagoblin-f242807518a3cf079dac86d48dd3c19fc985993e.tar.lz
mediagoblin-f242807518a3cf079dac86d48dd3c19fc985993e.tar.xz
mediagoblin-f242807518a3cf079dac86d48dd3c19fc985993e.zip
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/edit/views.py')
-rw-r--r--mediagoblin/edit/views.py18
1 files changed, 7 insertions, 11 deletions
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,