diff options
author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-12 18:58:04 -0400 |
---|---|---|
committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-12 18:58:04 -0400 |
commit | 045fe0ee9d43aa825de6fbf14fe8fd48953d4eff (patch) | |
tree | e0743c13e20845a613ba8e4064cb1e0f10f54025 /mediagoblin/plugins/persona/views.py | |
parent | a02831687a6026b2baa0f971ecb3e594c3f415e2 (diff) | |
parent | 66cafc3b74d476710013efb46341b989028f3057 (diff) | |
download | mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.lz mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.xz mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.zip |
Merge branch 'master' into OPW-Moderation-Update
Conflicts:
mediagoblin/db/migrations.py
Diffstat (limited to 'mediagoblin/plugins/persona/views.py')
-rw-r--r-- | mediagoblin/plugins/persona/views.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mediagoblin/plugins/persona/views.py b/mediagoblin/plugins/persona/views.py index f3aff38d..1bba3b8c 100644 --- a/mediagoblin/plugins/persona/views.py +++ b/mediagoblin/plugins/persona/views.py @@ -64,6 +64,7 @@ def login(request): if user: request.session['user_id'] = unicode(user.id) + request.session['persona_login_email'] = email request.session.save() return redirect(request, "index") @@ -183,9 +184,11 @@ def add(request): new_entry.user_id = request.user.id new_entry.save() + request.session['persona_login_email'] = email + messages.add_message( request, messages.SUCCESS, - _('Your Person email address was saved successfully.')) + _('Your Persona email address was saved successfully.')) return redirect(request, 'mediagoblin.edit.account') |