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 3d2f9d32de268da53eb053e0f746b5b30577c3c7..0e0108670a8cf016c17705509b3c910a197fd3e9 100644 (file)
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -1,20 +1,25 @@
 import datetime
 import datetime

+import logging
+

 from forum import settings
 from django.core.exceptions import ObjectDoesNotExist
 from forum import settings
 from django.core.exceptions import ObjectDoesNotExist

+from django.core.urlresolvers import reverse

 from django.utils import simplejson
 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.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 import RequestContext

+
+from django.template.loader import render_to_string

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

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

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


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


@@ -90,13 +96,11 @@ def vote_post(request, id, vote_type):
                     )
 
         old_vote.cancel(ip=request.META['REMOTE_ADDR'])
                     )
 
         old_vote.cancel(ip=request.META['REMOTE_ADDR'])

-        score_inc += (old_vote.__class__ == VoteDownAction) and 1 or -1
-
-    if old_vote.__class__ != new_vote_cls:
-        new_vote_cls(user=user, node=post, ip=request.META['REMOTE_ADDR']).save()
-        score_inc += (new_vote_cls == VoteUpAction) and 1 or -1
-    else:
+        score_inc = (old_vote.__class__ == VoteDownAction) and 1 or -1

         vote_type = "none"
         vote_type = "none"

+    else:
+        new_vote_cls(user=user, node=post, ip=request.META['REMOTE_ADDR']).save()
+        score_inc = (new_vote_cls == VoteUpAction) and 1 or -1

 
     response = {
     'commands': {
 
     response = {
     'commands': {


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


@@ -265,7 +269,8 @@ def comment(request, id):
                 id, comment.id, comment.comment, user.decorated_name, user.get_profile_url(),
                 reverse('delete_comment', kwargs={'id': comment.id}),
                 reverse('node_markdown', kwargs={'id': comment.id}),
                 id, comment.id, comment.comment, user.decorated_name, user.get_profile_url(),
                 reverse('delete_comment', kwargs={'id': comment.id}),
                 reverse('node_markdown', kwargs={'id': comment.id}),

-                reverse('convert_comment', kwargs={'id': comment.id}),            
+                reverse('convert_comment', kwargs={'id': comment.id}),
+                user.can_convert_comment_to_answer(comment),

                 ]
         }
         }
                 ]
         }
         }


@@ -408,8 +413,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 +429,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:


@@ -456,36 +462,6 @@ def convert_comment_to_answer(request, id):
 
     return RefreshPageCommand()
 
 
     return RefreshPageCommand()
 

-@decorate.withfn(command)
-def convert_to_question(request, id):
-    user = request.user
-    answer = get_object_or_404(Answer, id=id)
-    question = answer.question
-
-    if not request.POST:
-        description = lambda a: _("Answer by %(uname)s: %(snippet)s...") % {'uname': a.author.username,
-                                                                            'snippet': a.summary[:10]}
-        nodes = [(question.id, _("Question"))]
-        [nodes.append((a.id, description(a))) for a in
-         question.answers.filter_state(deleted=False).exclude(id=answer.id)]
-
-        return render_to_response('node/convert_to_question.html', {'answer': answer})
-
-    if not user.is_authenticated():
-        raise AnonymousNotAllowedException(_("convert answers to questions"))
-
-    if not user.can_convert_to_question(answer):
-        raise NotEnoughRepPointsException(_("convert answers to questions"))
-
-    try:
-        title = request.POST.get('title', None)
-    except:
-        raise CommandException(_("You haven't specified the title of the new question"))
-
-    AnswerToQuestionAction(user=user, node=answer, ip=request.META['REMOTE_ADDR']).save(data=dict(title=title))
-
-    return RefreshPageCommand()
-

 @decorate.withfn(command)
 def subscribe(request, id, user=None):
     if user:
 @decorate.withfn(command)
 def subscribe(request, id, user=None):
     if user:


@@ -564,6 +540,10 @@ 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'])

+
+        if can_rank and isinstance(can_rank, basestring):
+            questions = questions.order_by(can_rank)
+

         return HttpResponse(simplejson.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")
         return HttpResponse(simplejson.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")


@@ -578,5 +558,46 @@ def answer_permanent_link(request, id):
     # Getting the current object URL -- the Application URL + the object relative URL
     url = '%s%s' % (settings.APP_BASE_URL, answer.get_absolute_url())
 
     # Getting the current object URL -- the Application URL + the object relative URL
     url = '%s%s' % (settings.APP_BASE_URL, answer.get_absolute_url())
 

-    # Display the template
-    return render_to_response('node/permanent_link.html', { 'url' : url, })
+    if not request.POST:
+        # Display the template
+        return render_to_response('node/permanent_link.html', { 'url' : url, })
+
+    return {
+        'commands' : {
+            'copy_url' : [request.POST['permanent_link_url'],],
+        },
+        'message' : _("The permanent URL to the answer has been copied to your clipboard."),
+    }
+
+@decorate.withfn(command)
+def award_points(request, user_id, answer_id):
+    user = request.user
+    awarded_user = get_object_or_404(User, id=user_id)
+    answer = get_object_or_404(Answer, id=answer_id)
+
+    # Users shouldn't be able to award themselves
+    if awarded_user.id == user.id:
+        raise CannotDoOnOwnException(_("award"))
+
+    # Anonymous users cannot award  points, they just don't have such
+    if not user.is_authenticated():
+        raise AnonymousNotAllowedException(_('award'))
+
+    if not request.POST:
+        return render_to_response("node/award_points.html", { 'user' : user, 'awarded_user' : awarded_user, })
+    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"))
+
+        extra = dict(message=request.POST.get('message', ''), awarding_user=request.user.id, value=points)
+
+        # We take points from the awarding user
+        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} }