aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/auth/views.py
diff options
context:
space:
mode:
authorCaleb Forbes Davis V <caldavis@gmail.com>2011-07-04 20:04:00 -0500
committerCaleb Forbes Davis V <caldavis@gmail.com>2011-07-04 20:04:00 -0500
commite054ae9b3dfc518a34eb4a7395b177f0e8a31469 (patch)
tree274f1a4fc3572277424dfd60d2b6df021f72347c /mediagoblin/auth/views.py
parentcfe46f3e68b62bba0cfb943dc45e9b88c3f7c25e (diff)
downloadmediagoblin-e054ae9b3dfc518a34eb4a7395b177f0e8a31469.tar.lz
mediagoblin-e054ae9b3dfc518a34eb4a7395b177f0e8a31469.tar.xz
mediagoblin-e054ae9b3dfc518a34eb4a7395b177f0e8a31469.zip
allows using messaging instead of verify_email.html to pass tests
* re-instated verification_successful flag * modified test_auth to verify nav to user_pages/user.html template
Diffstat (limited to 'mediagoblin/auth/views.py')
-rw-r--r--mediagoblin/auth/views.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index 435ad803..47707ca5 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -126,11 +126,13 @@ def verify_email(request):
user['status'] = u'active'
user['email_verified'] = True
user.save()
+ verification_successful = True
messages.add_message(request,
messages.SUCCESS,
'Your email address has been verified. ' \
'You may now login!')
else:
+ verification_successful = False
messages.add_message(request,
messages.ERROR,
'The verification key or user id is incorrect')
@@ -138,7 +140,8 @@ def verify_email(request):
return render_to_response(
request,
'mediagoblin/user_pages/user.html',
- {'user': user})
+ {'user': user,
+ 'verification_successful' : verification_successful})
def resend_activation(request):