X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/9b6be99a1eed1adddfd062642f6ca23f79d14aea..ebcd401830c8088d581c91e28f83b134d075ad18:/forum/views/commands.py diff --git a/forum/views/commands.py b/forum/views/commands.py index a8f6d42..191cae0 100644 --- a/forum/views/commands.py +++ b/forum/views/commands.py @@ -10,9 +10,9 @@ from forum.models import * 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 import settings import logging @@ -57,7 +57,7 @@ class CannotDoubleActionException(CommandException): ) -@command +@decorate.withfn(command) def vote_post(request, id, vote_type): post = get_object_or_404(Node, id=id).leaf user = request.user @@ -113,7 +113,7 @@ def vote_post(request, id, vote_type): return response -@command +@decorate.withfn(command) def flag_post(request, id): if not request.POST: return render_to_response('node/report.html', {'types': settings.FLAG_TYPES}) @@ -149,7 +149,7 @@ def flag_post(request, id): return {'message': _("Thank you for your report. A moderator will review your submission shortly.")} -@command +@decorate.withfn(command) def like_comment(request, id): comment = get_object_or_404(Comment, id=id) user = request.user @@ -179,7 +179,7 @@ def like_comment(request, id): } } -@command +@decorate.withfn(command) def delete_comment(request, id): comment = get_object_or_404(Comment, id=id) user = request.user @@ -199,7 +199,7 @@ def delete_comment(request, id): } } -@command +@decorate.withfn(command) def mark_favorite(request, id): question = get_object_or_404(Question, id=id) @@ -221,7 +221,7 @@ def mark_favorite(request, id): } } -@command +@decorate.withfn(command) def comment(request, id): post = get_object_or_404(Node, id=id) user = request.user @@ -262,9 +262,10 @@ def comment(request, id): return { 'commands': { 'insert_comment': [ - id, comment.id, comment.comment, user.username, user.get_profile_url(), + 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}), ] } } @@ -275,7 +276,7 @@ def comment(request, id): } } -@command +@decorate.withfn(command) def node_markdown(request, id): user = request.user @@ -283,11 +284,14 @@ 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") -@command +@decorate.withfn(command) def accept_answer(request, id): + if settings.DISABLE_ACCEPTING_FEATURE: + raise Http404() + user = request.user if not user.is_authenticated(): @@ -297,7 +301,7 @@ def accept_answer(request, id): 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 = {} @@ -305,18 +309,24 @@ def accept_answer(request, id): 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] return {'commands': commands} -@command +@decorate.withfn(command) def delete_post(request, id): post = get_object_or_404(Node, id=id) user = request.user @@ -339,7 +349,7 @@ def delete_post(request, id): return ret -@command +@decorate.withfn(command) def close(request, id, close): if close and not request.POST: return render_to_response('node/report.html', {'types': settings.CLOSE_TYPES}) @@ -368,7 +378,7 @@ def close(request, id, close): return RefreshPageCommand() -@command +@decorate.withfn(command) def wikify(request, id): node = get_object_or_404(Node, id=id) user = request.user @@ -392,7 +402,7 @@ def wikify(request, id): return RefreshPageCommand() -@command +@decorate.withfn(command) def convert_to_comment(request, id): user = request.user answer = get_object_or_404(Answer, id=id) @@ -425,24 +435,86 @@ def convert_to_comment(request, id): return RefreshPageCommand() -@command -def subscribe(request, id): +@decorate.withfn(command) +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: - subscription = QuestionSubscription.objects.get(question=question, user=request.user) + subscription = QuestionSubscription.objects.get(question=question, user=user) 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 { - '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 @@ -470,19 +542,31 @@ def matching_tags(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 += (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") +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): + 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) - 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()