View refacotring: moved message rendering view to views/message.py

3 files changed, 19 insertions, 43 deletions

diff --git a/urls.py b/urls.py
index b8dd789..6c17fe3 100644
--- a/urls.py
+++ b/urls.py
@@ -39,7 +39,7 @@ urlpatterns = patterns('',
 
     # Message
     url(r'^message/(?P<mlist_fqdn>.*@.*)/(?P<messageid>.+)/$',
-        'views.pages.message'),
+        'views.message.index'),
 
 
     # Search
diff --git a/views/message.py b/views/message.py
index 105f542..57059ad 100644
--- a/views/message.py
+++ b/views/message.py
@@ -10,10 +10,28 @@ from django.contrib.auth.decorators import (login_required,
                                             permission_required,
                                             user_passes_test)
 from gsoc.models import Rating
+from pages import SearchForm, STORE
 
 logger = logging.getLogger(__name__)
 
 
+def index (request, mlist_fqdn, messageid):
+    ''' Displays a single message identified by its messageid '''
+    list_name = mlist_fqdn.split('@')[0]
+
+    search_form = SearchForm(auto_id=False)
+    t = loader.get_template('message.html')
+    message = STORE.get_email(list_name, messageid)
+    message.email = message.email.strip()
+    c = RequestContext(request, {
+        'app_name': settings.APP_NAME,
+        'list_name' : list_name,
+        'list_address': mlist_fqdn,
+        'message': message,
+	'messageid' : messageid,
+    })
+    return HttpResponse(t.render(c))
+
 
 
 @login_required
@@ -37,28 +55,3 @@ def vote (request, mlist_fqdn):
     response_dict = { }
 
     return HttpResponse(simplejson.dumps(response_dict), mimetype='application/javascript')
-
-
-@login_required
-def add_tag(request, mlist_fqdn, email_id):
-    """ Add a tag to a given message. """
-    t = loader.get_template('add_tag_form.html')
-    if request.method == 'POST':
-        form = AddTagForm(request.POST)
-        if form.is_valid():
-            print "THERE WE ARE"
-            # TODO: Add the logic to add the tag
-            if form.data['from_url']:
-                return HttpResponseRedirect(form.data['from_url'])
-            else:
-                return HttpResponseRedirect('/')
-    else:
-        form = AddTagForm()
-    c = RequestContext(request, {
-        'app_name': settings.APP_NAME,
-        'list_address': mlist_fqdn,
-        'email_id': email_id,
-        'addtag_form': form,
-        })
-    return HttpResponse(t.render(c))
-
diff --git a/views/pages.py b/views/pages.py
index ae0c623..879c30a 100644
--- a/views/pages.py
+++ b/views/pages.py
@@ -19,7 +19,6 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, Invali
 from django.contrib.auth.decorators import (login_required,
                                             permission_required,
                                             user_passes_test)
-from lib.mockup import generate_thread_per_category, generate_top_author
 from kittystore.kittysastore import KittySAStore
 
 from thread import AddTagForm
@@ -253,22 +252,6 @@ def list(request, mlist_fqdn=None):
     })
     return HttpResponse(t.render(c))
 
-def message (request, mlist_fqdn, messageid):
-    ''' Displays a single message identified by its messageid '''
-    list_name = mlist_fqdn.split('@')[0]
-
-    search_form = SearchForm(auto_id=False)
-    t = loader.get_template('message.html')
-    message = STORE.get_email(list_name, messageid)
-    message.email = message.email.strip()
-    c = RequestContext(request, {
-        'app_name': settings.APP_NAME,
-        'list_name' : list_name,
-        'list_address': mlist_fqdn,
-        'message': message,
-	'messageid' : messageid,
-    })
-    return HttpResponse(t.render(c))
 
 def _search_results_page(request, mlist_fqdn, threads, search_type,
     page=1, num_threads=25, limit=None):