From cfe46f3e68b62bba0cfb943dc45e9b88c3f7c25e Mon Sep 17 00:00:00 2001
From: Caleb Forbes Davis V <caldavis@gmail.com>
Date: Mon, 4 Jul 2011 19:42:45 -0500
Subject: [PATCH] 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
---
 mediagoblin/auth/views.py                     | 15 ++++++----
 .../mediagoblin/auth/verify_email.html        | 28 -------------------
 2 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 mediagoblin/templates/mediagoblin/auth/verify_email.html

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):
diff --git a/mediagoblin/templates/mediagoblin/auth/verify_email.html b/mediagoblin/templates/mediagoblin/auth/verify_email.html
deleted file mode 100644
index b6e6d1f8..00000000
--- a/mediagoblin/templates/mediagoblin/auth/verify_email.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{#
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "mediagoblin/base.html" %}
-
-{% block mediagoblin_content %}
-<p>
-  {% if verification_successful %}
-    Your email address has been verified!
-  {% else %}
-    The verification key or user id is incorrect
-  {% endif %}
-</p>
-{% endblock %}
-- 
2.25.1