OSQA-720, changing the WMD markdown editor, applying patches that resolve issues...

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

diff --git a/forum/views/commands.py b/forum/views/commands.py
index f34619a4c1437db21f4597b2f40cb5524daf758e..0e0108670a8cf016c17705509b3c910a197fd3e9 100644 (file)
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -1,21 +1,25 @@
 import datetime
+import logging
+
 from forum import settings
 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.utils.translation import ungettext, ugettext as _
 from django.template import RequestContext
+
 from django.template.loader import render_to_string
 from forum.models import *
 from forum.models.node import NodeMetaClass
-from forum.actions import *
-from django.core.urlresolvers import reverse
 from forum.utils.decorators import ajax_method, ajax_login_required
-from decorators import command, CommandException, RefreshPageCommand
+from forum.actions import *
 from forum.modules import decorate
 from forum import settings
-import logging
+
+from decorators import command, CommandException, RefreshPageCommand
 
 class NotEnoughRepPointsException(CommandException):
     def __init__(self, action):
@@ -73,6 +77,7 @@ def vote_post(request, id, vote_type):
         raise NotEnoughRepPointsException(vote_type == 'up' and _('upvote') or _('downvote'))
 
     user_vote_count_today = user.get_vote_count_today()
+    user_can_vote_count_today = user.can_vote_count_today()
 
     if user_vote_count_today >= user.can_vote_count_today():
         raise NotEnoughLeftException(_('votes'), str(settings.MAX_VOTES_PER_DAY))
@@ -104,7 +109,7 @@ def vote_post(request, id, vote_type):
     }
     }
 
-    votes_left = (int(settings.MAX_VOTES_PER_DAY) - user_vote_count_today) + (vote_type == 'none' and -1 or 1)
+    votes_left = (user_can_vote_count_today - user_vote_count_today) + (vote_type == 'none' and -1 or 1)
 
     if int(settings.START_WARN_VOTES_LEFT) >= votes_left:
         response['message'] = _("You have %(nvotes)s %(tvotes)s left today.") % \
@@ -408,8 +413,15 @@ def convert_to_comment(request, id):
     answer = get_object_or_404(Answer, id=id)
     question = answer.question
 
+    # Check whether the user has the required permissions
+    if not user.is_authenticated():
+        raise AnonymousNotAllowedException(_("convert answers to comments"))
+
+    if not user.can_convert_to_comment(answer):
+        raise NotEnoughRepPointsException(_("convert answers to comments"))
+
     if not request.POST:
-        description = lambda a: _("Answer by %(uname)s: %(snippet)s...") % {'uname': a.author.username,
+        description = lambda a: _("Answer by %(uname)s: %(snippet)s...") % {'uname': smart_unicode(a.author.username),
                                                                             'snippet': a.summary[:10]}
         nodes = [(question.id, _("Question"))]
         [nodes.append((a.id, description(a))) for a in
@@ -417,12 +429,6 @@ def convert_to_comment(request, id):
 
         return render_to_response('node/convert_to_comment.html', {'answer': answer, 'nodes': nodes})
 
-    if not user.is_authenticated():
-        raise AnonymousNotAllowedException(_("convert answers to comments"))
-
-    if not user.can_convert_to_comment(answer):
-        raise NotEnoughRepPointsException(_("convert answers to comments"))
-
     try:
         new_parent = Node.objects.get(id=request.POST.get('under', None))
     except:
@@ -583,6 +589,9 @@ def award_points(request, user_id, answer_id):
         points = int(request.POST['points'])
 
         # We should check if the user has enough reputation points, otherwise we raise an exception.
+        if points < 0:
+            raise CommandException(_("The number of points to award needs to be a positive value."))
+
         if user.reputation < points:
             raise NotEnoughRepPointsException(_("award"))