diff options
author | Aamir Khan <syst3m.w0rm@gmail.com> | 2012-06-20 01:40:47 -0400 |
---|---|---|
committer | Aamir Khan <syst3m.w0rm@gmail.com> | 2012-06-20 01:40:47 -0400 |
commit | afeb421a85a848c35183743d59d633f5997dd673 (patch) | |
tree | 0204977dfdf682c3eed5289fea521541c344d3bb | |
parent | 2940d8fa06b9397d8e882680045b220522e34d83 (diff) | |
download | hyperkitty-afeb421a85a848c35183743d59d633f5997dd673.tar.gz hyperkitty-afeb421a85a848c35183743d59d633f5997dd673.tar.xz hyperkitty-afeb421a85a848c35183743d59d633f5997dd673.zip |
Moving views related to message to message.py
-rw-r--r-- | views/message.py | 62 | ||||
-rw-r--r-- | views/pages.py | 71 |
2 files changed, 73 insertions, 60 deletions
diff --git a/views/message.py b/views/message.py new file mode 100644 index 0000000..64172ee --- /dev/null +++ b/views/message.py @@ -0,0 +1,62 @@ +import logging +import django.utils.simplejson as simplejson + +from django import forms +from django.http import HttpResponse, HttpResponseRedirect +from django.template import RequestContext, loader +from django.conf import settings +from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, InvalidPage +from django.contrib.auth.decorators import (login_required, + permission_required, + user_passes_test) +from gsoc.models import Rating + +logger = logging.getLogger(__name__) + + + + +@login_required +def vote_message (request, mlist_fqdn, messageid): + """ Add a rating to a given message identified by messageid. """ + if not request.user.is_authenticated(): + return redirect('user_login') + + value = request.POST['vote'] + + # Checks if the user has already voted for a this message. If yes modify db entry else create a new one. + try: + v = Rating.objects.get(user = request.user, messageid = messageid, list_address = mlist_fqdn) + except Rating.DoesNotExist: + v = Rating(list_address=mlist_fqdn, messageid = messageid, vote = value) + + v.user = request.user + v.vote = value + v.save() + 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('simple_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 8782e5b..d41096a 100644 --- a/views/pages.py +++ b/views/pages.py @@ -1,36 +1,33 @@ #-*- coding: utf-8 -*- -from calendar import timegm -from datetime import datetime, timedelta +import re +import os import json import logging -import os -import re -from urlparse import urljoin import urllib import django.utils.simplejson as simplejson + +from calendar import timegm +from datetime import datetime, timedelta + +from urlparse import urljoin from django import forms from django.http import HttpResponse, HttpResponseRedirect from django.template import RequestContext, loader from django.conf import settings from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, InvalidPage -#import urlgrabber -from gsoc.models import Rating - from django.contrib.auth.decorators import (login_required, permission_required, user_passes_test) - -from bunch import Bunch - from lib.mockup import generate_thread_per_category, generate_top_author - from kittystore.kittysastore import KittySAStore -# Move this into settings.py +logger = logging.getLogger(__name__) + + +# @TODO : Move this into settings.py MONTH_PARTICIPANTS = 284 MONTH_DISCUSSIONS = 82 -logger = logging.getLogger(__name__) STORE = KittySAStore(settings.KITTYSTORE_URL) @@ -84,52 +81,6 @@ def index(request): }) return HttpResponse(t.render(c)) -@login_required -def vote_message (request, mlist_fqdn, messageid): - """ Add a rating to a given message identified by messageid. """ - if not request.user.is_authenticated(): - return redirect('user_login') - - value = request.POST['vote'] - - # Checks if the user has already voted for a this message. If yes modify db entry else create a new one. - try: - v = Rating.objects.get(user = request.user, messageid = messageid, list_address = mlist_fqdn) - except Rating.DoesNotExist: - v = Rating(list_address=mlist_fqdn, messageid = messageid, vote = value) - - v.user = request.user - v.vote = value - v.save() - 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('simple_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)) - def add_category(request, mlist_fqdn, email_id): """ Add a category to a given message. """ t = loader.get_template('simple_form.html') |