#SPLUNK-91, modifying the permanent link tool, adding an option to copy to the clipbo...

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

diff --git a/forum/views/commands.py b/forum/views/commands.py
index 4fba05fd7fa1e8626a1f998b6b356cf9017285ce..f88dee8ed2948d17094ad73d5fe352421f14bd71 100644 (file)
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -6,6 +6,7 @@ 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 *
@@ -73,7 +74,7 @@ def vote_post(request, id, vote_type):
 
     user_vote_count_today = user.get_vote_count_today()
 
-    if user_vote_count_today >= int(settings.MAX_VOTES_PER_DAY):
+    if user_vote_count_today >= user.can_vote_count_today():
         raise NotEnoughLeftException(_('votes'), str(settings.MAX_VOTES_PER_DAY))
 
     new_vote_cls = (vote_type == 'up') and VoteUpAction or VoteDownAction
@@ -264,7 +265,8 @@ def comment(request, id):
         'insert_comment': [
                 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('node_markdown', kwargs={'id': comment.id}),
+                reverse('convert_comment', kwargs={'id': comment.id}),            
                 ]
         }
         }
@@ -283,7 +285,7 @@ def node_markdown(request, id):
         raise AnonymousNotAllowedException(_('accept answers'))
 
     node = get_object_or_404(Node, id=id)
-    return HttpResponse(node.body, mimetype="text/plain")
+    return HttpResponse(node.active_revision.body, mimetype="text/plain")
 
 
 @decorate.withfn(command)
@@ -435,32 +437,23 @@ def convert_to_comment(request, id):
     return RefreshPageCommand()
 
 @decorate.withfn(command)
-def convert_to_question(request, id):
+def convert_comment_to_answer(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})
+    comment = get_object_or_404(Comment, id=id)
+    parent = comment.parent
 
+    if not parent.question:
+        question = parent
+    else:
+        question = parent.question
+    
     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"))
+        raise AnonymousNotAllowedException(_("convert comments to answers"))
 
-    AnswerToQuestionAction(user=user, node=answer, ip=request.META['REMOTE_ADDR']).save(data=dict(title=title))
+    if not user.can_convert_comment_to_answer(comment):
+        raise NotEnoughRepPointsException(_("convert comments to answers"))
+    
+    CommentToAnswerAction(user=user, node=comment, ip=request.META['REMOTE_ADDR']).save(data=dict(question=question))
 
     return RefreshPageCommand()
 
@@ -548,9 +541,54 @@ def related_questions(request):
     else:
         raise Http404()
 
+@decorate.withfn(command)
+def answer_permanent_link(request, id):
+    # Getting the current answer object
+    answer = get_object_or_404(Answer, id=id)
+
+    # Getting the current object URL -- the Application URL + the object relative URL
+    url = '%s%s' % (settings.APP_BASE_URL, answer.get_absolute_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 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, extra=extra).save(data=dict(value=-points, affected=user))
 
+        # And give them to the awarded one
+        AwardPointsAction(user=request.user, extra=extra).save(data=dict(value=points, affected=awarded_user))
 
+        return { 'message' : _("You have awarded %s with %d points") % (awarded_user, points) }