Merge pull request #26 from udacity/remove_dj_version

[osqa.git] / forum / views / commands.py

diff --git a/forum/views/commands.py b/forum/views/commands.py
index e909bdf2b95036baa98fe00390cf69066f3dd0d6..62d864f80383314eeeb8b1da8a002adb3fb9a910 100644 (file)
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -1,18 +1,20 @@
 # -*- coding: utf-8 -*-
 
 import datetime
+import json
 import logging
 
 from urllib import urlencode
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
-from django.utils import simplejson
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ungettext, ugettext as _
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import get_object_or_404, render_to_response
 
+from django.contrib import messages
+
 from forum.models import *
 from forum.utils.decorators import ajax_login_required
 from forum.actions import *
@@ -22,7 +24,7 @@ from forum import settings
 from decorators import command, CommandException, RefreshPageCommand
 
 class NotEnoughRepPointsException(CommandException):
-    def __init__(self, action, user_reputation=None, reputation_required=None):
+    def __init__(self, action, user_reputation=None, reputation_required=None, node=None):
         if reputation_required is not None and user_reputation is not None:
             message = _(
                 """Sorry, but you don't have enough reputation points to %(action)s.<br />
@@ -75,6 +77,10 @@ class CannotDoubleActionException(CommandException):
 
 @decorate.withfn(command)
 def vote_post(request, id, vote_type):
+    if not request.method == 'POST':
+        raise CommandException(_("Invalid request"))
+
+
     post = get_object_or_404(Node, id=id).leaf
     user = request.user
 
@@ -87,7 +93,7 @@ def vote_post(request, id, vote_type):
     if not (vote_type == 'up' and user.can_vote_up() or user.can_vote_down()):
         reputation_required = int(settings.REP_TO_VOTE_UP) if vote_type == 'up' else int(settings.REP_TO_VOTE_DOWN)
         action_type = vote_type == 'up' and _('upvote') or _('downvote')
-        raise NotEnoughRepPointsException(action_type, user_reputation=user.reputation, reputation_required=reputation_required)
+        raise NotEnoughRepPointsException(action_type, user_reputation=user.reputation, reputation_required=reputation_required, node=post)
 
     user_vote_count_today = user.get_vote_count_today()
     user_can_vote_count_today = user.can_vote_count_today()
@@ -178,7 +184,7 @@ def like_comment(request, id):
         raise CannotDoOnOwnException(_('like'))
 
     if not user.can_like_comment(comment):
-        raise NotEnoughRepPointsException( _('like comments'))
+        raise NotEnoughRepPointsException( _('like comments'), node=comment)
 
     like = VoteAction.get_action_for(node=comment, user=user)
 
@@ -218,17 +224,17 @@ def delete_comment(request, id):
 
 @decorate.withfn(command)
 def mark_favorite(request, id):
-    question = get_object_or_404(Question, id=id)
+    node = get_object_or_404(Node, id=id)
 
     if not request.user.is_authenticated():
         raise AnonymousNotAllowedException(_('mark a question as favorite'))
 
     try:
-        favorite = FavoriteAction.objects.get(canceled=False, node=question, user=request.user)
+        favorite = FavoriteAction.objects.get(canceled=False, node=node, user=request.user)
         favorite.cancel(ip=request.META['REMOTE_ADDR'])
         added = False
     except ObjectDoesNotExist:
-        FavoriteAction(node=question, user=request.user, ip=request.META['REMOTE_ADDR']).save()
+        FavoriteAction(node=node, user=request.user, ip=request.META['REMOTE_ADDR']).save()
         added = True
 
     return {
@@ -349,7 +355,7 @@ def accept_answer(request, id):
             """)
 
             # Notify the user with a message that an answer has been accepted
-            request.user.message_set.create(message=msg)
+            messages.info(request, msg)
 
             # Redirect URL should include additional get parameters that might have been attached
             redirect_url = answer.parent.get_absolute_url() + "?accepted_answer=true&%s" % smart_unicode(urlencode(request.GET))
@@ -541,7 +547,7 @@ def mark_tag(request, tag=None, **kwargs):#tagging system
                 pass
         else:
             ts.update(reason=reason)
-    return HttpResponse(simplejson.dumps(''), mimetype="application/json")
+    return HttpResponse(json.dumps(''), mimetype="application/json")
 
 def matching_tags(request):
     if len(request.GET['q']) == 0:
@@ -573,7 +579,7 @@ def related_questions(request):
         if can_rank and isinstance(can_rank, basestring):
             questions = questions.order_by(can_rank)
 
-        return HttpResponse(simplejson.dumps(
+        return HttpResponse(json.dumps(
                 [dict(title=q.title, url=q.get_absolute_url(), score=q.score, summary=q.summary)
                  for q in questions.filter_state(deleted=False)[0:10]]), mimetype="application/json")
     else:
@@ -613,7 +619,11 @@ def award_points(request, user_id, answer_id):
         raise AnonymousNotAllowedException(_('award'))
 
     if not request.POST:
-        return render_to_response("node/award_points.html", { 'user' : user, 'awarded_user' : awarded_user, })
+        return render_to_response("node/award_points.html", {
+            'user' : user,
+            'awarded_user' : awarded_user,
+            'reputation_to_comment' : str(settings.REP_TO_COMMENT)
+        })
     else:
         points = int(request.POST['points'])
 
@@ -630,3 +640,4 @@ def award_points(request, user_id, answer_id):
         AwardPointsAction(user=request.user, node=answer, extra=extra).save(data=dict(value=points, affected=awarded_user))
 
         return { 'message' : _("You have awarded %(awarded_user)s with %(points)d points") % {'awarded_user' : awarded_user, 'points' : points} }
+