Makes tips on the ask a question page editable in the admin.

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

diff --git a/forum/views/commands.py b/forum/views/commands.py
index fcdd0561a79b2410fd4da7b42e5cd4129e9bb654..f7d91aefd89e60b56942699dd0e5734c5f7cc27b 100644 (file)
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -73,7 +73,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
@@ -284,7 +284,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)
@@ -456,36 +456,6 @@ def convert_comment_to_answer(request, id):
 
     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:
@@ -570,9 +540,46 @@ 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())
+
+    # Display the template
+    return render_to_response('node/permanent_link.html', { 'url' : url, })
 
+@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
+        BonusRepAction(user=request.user, extra=extra).save(data=dict(value=-points, affected=user))
 
+        # And give them to the awarded one
+        BonusRepAction(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) }