Merge pull request #42 from aniketschneider/validation-email-template

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

diff --git a/forum/views/commands.py b/forum/views/commands.py
index 0b5412686d2ae558961d2d859fc49bc06c4c8176..62d864f80383314eeeb8b1da8a002adb3fb9a910 100644 (file)
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -1,29 +1,46 @@
+# -*- coding: utf-8 -*-
+

 import datetime
 import datetime

-from forum import settings
+import json
+import logging
+
+from urllib import urlencode
+

 from django.core.exceptions import ObjectDoesNotExist
 from django.core.exceptions import ObjectDoesNotExist

-from django.utils import simplejson
+from django.core.urlresolvers import reverse
+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.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 django.contrib import messages
+

 from forum.models import *
 from forum.models import *

-from forum.models.node import NodeMetaClass
+from forum.utils.decorators import ajax_login_required

 from forum.actions import *
 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.modules import decorate
 from forum import settings
 from forum.modules import decorate
 from forum import settings

-import logging
+
+from decorators import command, CommandException, RefreshPageCommand

 
 class NotEnoughRepPointsException(CommandException):
 
 class NotEnoughRepPointsException(CommandException):

-    def __init__(self, action):
-        super(NotEnoughRepPointsException, self).__init__(
-                _(
-                        """Sorry, but you don't have enough reputation points to %(action)s.<br />Please check the <a href='%(faq_url)s'>faq</a>"""
-                        ) % {'action': action, 'faq_url': reverse('faq')}
-                )
+    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 />
+                The minimum reputation required is %(reputation_required)d (yours is %(user_reputation)d).
+                Please check the <a href='%(faq_url)s'>FAQ</a>"""
+            ) % {
+                'action': action,
+                'faq_url': reverse('faq'),
+                'reputation_required' : reputation_required,
+                'user_reputation' : user_reputation,
+            }
+        else:
+            message = _(
+                """Sorry, but you don't have enough reputation points to %(action)s.<br />Please check the <a href='%(faq_url)s'>faq</a>"""
+            ) % {'action': action, 'faq_url': reverse('faq')}
+        super(NotEnoughRepPointsException, self).__init__(message)

 
 class CannotDoOnOwnException(CommandException):
     def __init__(self, action):
 
 class CannotDoOnOwnException(CommandException):
     def __init__(self, action):


@@ -60,6 +77,10 @@ class CannotDoubleActionException(CommandException):
 
 @decorate.withfn(command)
 def vote_post(request, id, vote_type):
 
 @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
 
     post = get_object_or_404(Node, id=id).leaf
     user = request.user
 


@@ -70,9 +91,12 @@ def vote_post(request, id, vote_type):
         raise CannotDoOnOwnException(_('vote'))
 
     if not (vote_type == 'up' and user.can_vote_up() or user.can_vote_down()):
         raise CannotDoOnOwnException(_('vote'))
 
     if not (vote_type == 'up' and user.can_vote_up() or user.can_vote_down()):

-        raise NotEnoughRepPointsException(vote_type == 'up' and _('upvote') or _('downvote'))
+        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, node=post)

 
     user_vote_count_today = user.get_vote_count_today()
 
     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))
 
     if user_vote_count_today >= user.can_vote_count_today():
         raise NotEnoughLeftException(_('votes'), str(settings.MAX_VOTES_PER_DAY))


@@ -104,7 +128,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.") % \
 
     if int(settings.START_WARN_VOTES_LEFT) >= votes_left:
         response['message'] = _("You have %(nvotes)s %(tvotes)s left today.") % \


@@ -160,7 +184,7 @@ def like_comment(request, id):
         raise CannotDoOnOwnException(_('like'))
 
     if not user.can_like_comment(comment):
         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)
 
 
     like = VoteAction.get_action_for(node=comment, user=user)
 


@@ -200,17 +224,17 @@ def delete_comment(request, id):
 
 @decorate.withfn(command)
 def mark_favorite(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:
 
     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:
         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 {
         added = True
 
     return {


@@ -266,6 +290,7 @@ def comment(request, id):
                 reverse('node_markdown', kwargs={'id': comment.id}),
                 reverse('convert_comment', kwargs={'id': comment.id}),
                 user.can_convert_comment_to_answer(comment),
                 reverse('node_markdown', kwargs={'id': comment.id}),
                 reverse('convert_comment', kwargs={'id': comment.id}),
                 user.can_convert_comment_to_answer(comment),

+                bool(settings.SHOW_LATEST_COMMENTS_FIRST)

                 ]
         }
         }
                 ]
         }
         }


@@ -322,6 +347,21 @@ def accept_answer(request, id):
 
 
         AcceptAnswerAction(node=answer, user=user, ip=request.META['REMOTE_ADDR']).save()
 
 
         AcceptAnswerAction(node=answer, user=user, ip=request.META['REMOTE_ADDR']).save()

+
+        # If the request is not an AJAX redirect to the answer URL rather than to the home page
+        if not request.is_ajax():
+            msg = _("""
+              Congratulations! You've accepted an answer.
+            """)
+
+            # Notify the user with a message that an answer has been accepted
+            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))
+
+            return HttpResponseRedirect(redirect_url)
+

         commands['mark_accepted'] = [answer.id]
 
     return {'commands': commands}
         commands['mark_accepted'] = [answer.id]
 
     return {'commands': commands}


@@ -408,8 +448,15 @@ def convert_to_comment(request, id):
     answer = get_object_or_404(Answer, id=id)
     question = answer.question
 
     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:
     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
                                                                             'snippet': a.summary[:10]}
         nodes = [(question.id, _("Question"))]
         [nodes.append((a.id, description(a))) for a in


@@ -417,12 +464,6 @@ def convert_to_comment(request, id):
 
         return render_to_response('node/convert_to_comment.html', {'answer': answer, 'nodes': nodes})
 
 
         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:
     try:
         new_parent = Node.objects.get(id=request.POST.get('under', None))
     except:


@@ -506,7 +547,7 @@ def mark_tag(request, tag=None, **kwargs):#tagging system
                 pass
         else:
             ts.update(reason=reason)
                 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:
 
 def matching_tags(request):
     if len(request.GET['q']) == 0:


@@ -534,7 +575,11 @@ def matching_users(request):
 def related_questions(request):
     if request.POST and request.POST.get('title', None):
         can_rank, questions = Question.objects.search(request.POST['title'])
 def related_questions(request):
     if request.POST and request.POST.get('title', None):
         can_rank, questions = Question.objects.search(request.POST['title'])

-        return HttpResponse(simplejson.dumps(
+
+        if can_rank and isinstance(can_rank, basestring):
+            questions = questions.order_by(can_rank)
+
+        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:
                 [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:


@@ -574,11 +619,18 @@ def award_points(request, user_id, answer_id):
         raise AnonymousNotAllowedException(_('award'))
 
     if not request.POST:
         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'])
 
         # We should check if the user has enough reputation points, otherwise we raise an exception.
     else:
         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"))
 
         if user.reputation < points:
             raise NotEnoughRepPointsException(_("award"))
 


@@ -588,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} }
         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} }

+