Merge of jambazov branch to trunk. Adds CC license and failed sign-in referrer bug...

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

diff --git a/forum/views/commands.py b/forum/views/commands.py
index ed72bd1058d7799afd96cb0271cea7e9fd0b68e2..af6ad644e8ee6466dad347890b9995e15722a214 100644 (file)
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -10,7 +10,6 @@ from forum.models import *
 from forum.models.node import NodeMetaClass
 from forum.actions import *
 from django.core.urlresolvers import reverse
 from forum.models.node import NodeMetaClass
 from forum.actions import *
 from django.core.urlresolvers import reverse

-from django.contrib.auth.decorators import login_required

 from forum.utils.decorators import ajax_method, ajax_login_required
 from decorators import command, CommandException, RefreshPageCommand
 from forum.modules import decorate
 from forum.utils.decorators import ajax_method, ajax_login_required
 from decorators import command, CommandException, RefreshPageCommand
 from forum.modules import decorate


@@ -74,7 +73,7 @@ def vote_post(request, id, vote_type):
 
     user_vote_count_today = user.get_vote_count_today()
 
 
     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
         raise NotEnoughLeftException(_('votes'), str(settings.MAX_VOTES_PER_DAY))
 
     new_vote_cls = (vote_type == 'up') and VoteUpAction or VoteDownAction


@@ -265,7 +264,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}),
         '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}),            

                 ]
         }
         }
                 ]
         }
         }


@@ -284,11 +284,14 @@ def node_markdown(request, id):
         raise AnonymousNotAllowedException(_('accept answers'))
 
     node = get_object_or_404(Node, id=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)
 def accept_answer(request, id):
 
 
 @decorate.withfn(command)
 def accept_answer(request, id):

+    if settings.DISABLE_ACCEPTING_FEATURE:
+        raise Http404()
+

     user = request.user
 
     if not user.is_authenticated():
     user = request.user
 
     if not user.is_authenticated():


@@ -298,7 +301,7 @@ def accept_answer(request, id):
     question = answer.question
 
     if not user.can_accept_answer(answer):
     question = answer.question
 
     if not user.can_accept_answer(answer):

-        raise CommandException(_("Sorry but only the question author can accept an answer"))
+        raise CommandException(_("Sorry but you cannot accept the answer"))

 
     commands = {}
 
 
     commands = {}
 


@@ -306,11 +309,17 @@ def accept_answer(request, id):
         answer.nstate.accepted.cancel(user, ip=request.META['REMOTE_ADDR'])
         commands['unmark_accepted'] = [answer.id]
     else:
         answer.nstate.accepted.cancel(user, ip=request.META['REMOTE_ADDR'])
         commands['unmark_accepted'] = [answer.id]
     else:

-        accepted = question.accepted_answer
+        if settings.MAXIMUM_ACCEPTED_ANSWERS and (question.accepted_count >= settings.MAXIMUM_ACCEPTED_ANSWERS):
+            raise CommandException(ungettext("This question already has an accepted answer.",
+                "Sorry but this question has reached the limit of accepted answers.", int(settings.MAXIMUM_ACCEPTED_ANSWERS)))
+
+        if settings.MAXIMUM_ACCEPTED_PER_USER and question.accepted_count:
+            accepted_from_author = question.accepted_answers.filter(author=answer.author).count()
+
+            if accepted_from_author >= settings.MAXIMUM_ACCEPTED_PER_USER:
+                raise CommandException(ungettext("The author of this answer already has an accepted answer in this question.",
+                "Sorry but the author of this answer has reached the limit of accepted answers per question.", int(settings.MAXIMUM_ACCEPTED_PER_USER)))             

 
 

-        if accepted:
-            accepted.nstate.accepted.cancel(user, ip=request.META['REMOTE_ADDR'])
-            commands['unmark_accepted'] = [accepted.id]

 
         AcceptAnswerAction(node=answer, user=user, ip=request.META['REMOTE_ADDR']).save()
         commands['mark_accepted'] = [answer.id]
 
         AcceptAnswerAction(node=answer, user=user, ip=request.META['REMOTE_ADDR']).save()
         commands['mark_accepted'] = [answer.id]


@@ -427,23 +436,85 @@ def convert_to_comment(request, id):
     return RefreshPageCommand()
 
 @decorate.withfn(command)
     return RefreshPageCommand()
 
 @decorate.withfn(command)

-def subscribe(request, id):
+def convert_comment_to_answer(request, id):
+    user = request.user
+    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 comments to answers"))
+
+    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()
+
+@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:
+        try:
+            user = User.objects.get(id=user)
+        except User.DoesNotExist:
+            raise Http404()
+
+        if not (request.user.is_a_super_user_or_staff() or user.is_authenticated()):
+            raise CommandException(_("You do not have the correct credentials to preform this action."))
+    else:
+        user = request.user
+

     question = get_object_or_404(Question, id=id)
 
     try:
     question = get_object_or_404(Question, id=id)
 
     try:

-        subscription = QuestionSubscription.objects.get(question=question, user=request.user)
+        subscription = QuestionSubscription.objects.get(question=question, user=user)

         subscription.delete()
         subscribed = False
     except:
         subscription.delete()
         subscribed = False
     except:

-        subscription = QuestionSubscription(question=question, user=request.user, auto_subscription=False)
+        subscription = QuestionSubscription(question=question, user=user, auto_subscription=False)

         subscription.save()
         subscribed = True
 
     return {
         subscription.save()
         subscribed = True
 
     return {

-    'commands': {
-    'set_subscription_button': [subscribed and _('unsubscribe me') or _('subscribe me')],
-    'set_subscription_status': ['']
-    }
+        'commands': {
+            'set_subscription_button': [subscribed and _('unsubscribe me') or _('subscribe me')],
+            'set_subscription_status': ['']
+        }

     }
 
 #internally grouped views - used by the tagging system
     }
 
 #internally grouped views - used by the tagging system


@@ -471,19 +542,31 @@ def matching_tags(request):
     if len(request.GET['q']) == 0:
         raise CommandException(_("Invalid request"))
 
     if len(request.GET['q']) == 0:
         raise CommandException(_("Invalid request"))
 

-    possible_tags = Tag.active.filter(name__istartswith = request.GET['q'])
+    possible_tags = Tag.active.filter(name__icontains = request.GET['q'])

     tag_output = ''
     for tag in possible_tags:
     tag_output = ''
     for tag in possible_tags:

-        tag_output += (tag.name + "|" + tag.name + "." + tag.used_count.__str__() + "\n")
+        tag_output += "%s|%s|%s\n" % (tag.id, tag.name, tag.used_count)

 
     return HttpResponse(tag_output, mimetype="text/plain")
 
 
     return HttpResponse(tag_output, mimetype="text/plain")
 

+def matching_users(request):
+    if len(request.GET['q']) == 0:
+        raise CommandException(_("Invalid request"))
+
+    possible_users = User.objects.filter(username__icontains = request.GET['q'])
+    output = ''
+
+    for user in possible_users:
+        output += ("%s|%s|%s\n" % (user.id, user.decorated_name, user.reputation))
+
+    return HttpResponse(output, mimetype="text/plain")
+

 def related_questions(request):
     if request.POST and request.POST.get('title', None):
 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(
                 [dict(title=q.title, url=q.get_absolute_url(), score=q.score, summary=q.summary)
         return HttpResponse(simplejson.dumps(
                 [dict(title=q.title, url=q.get_absolute_url(), score=q.score, summary=q.summary)

-                 for q in Question.objects.search(request.POST['title']).filter_state(deleted=False)[0:10]]),
-                            mimetype="application/json")
+                 for q in questions.filter_state(deleted=False)[0:10]]), mimetype="application/json")

     else:
         raise Http404()
 
     else:
         raise Http404()