uses the messaging system to notify user of result of verification check

Feature #424 - Use messaging system for email verifification check response
* uses add_message in verify_email and routes to the user page, bypassing
  verify_email.html

1 files changed, 10 insertions, 5 deletions

diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index 1d00f382..435ad803 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -18,6 +18,7 @@ import uuid
 
 from webob import exc
 
+from mediagoblin import messages
 from mediagoblin.util import render_to_response, redirect
 from mediagoblin.db.util import ObjectId
 from mediagoblin.auth import lib as auth_lib
@@ -124,16 +125,20 @@ def verify_email(request):
     if user and user['verification_key'] == unicode(request.GET['token']):
         user['status'] = u'active'
         user['email_verified'] = True
-        verification_successful = True
         user.save()
+        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')   
         
     return render_to_response(
         request,
-        'mediagoblin/auth/verify_email.html',
-        {'user': user,
-         'verification_successful': verification_successful})
+        'mediagoblin/user_pages/user.html',
+        {'user': user})
 
 
 def resend_activation(request):