X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/b320ae1fdd45574568c13da6ebd12cefb52e63c4..cafe0a541b6349de15c0444bddf9493d8aa71df8:/forum/views/commands.py diff --git a/forum/views/commands.py b/forum/views/commands.py index 92e9857..ed72bd1 100644 --- a/forum/views/commands.py +++ b/forum/views/commands.py @@ -2,7 +2,7 @@ import datetime from forum import settings from django.core.exceptions import ObjectDoesNotExist from django.utils import simplejson -from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404 +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 @@ -12,43 +12,53 @@ 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 forum.modules.decorators import decoratable -from decorators import command, CommandException +from decorators import command, CommandException, RefreshPageCommand +from forum.modules import decorate from forum import settings import logging class NotEnoughRepPointsException(CommandException): def __init__(self, action): super(NotEnoughRepPointsException, self).__init__( - _("""Sorry, but you don't have enough reputation points to %(action)s.
Please check the faq""") % {'action': action, 'faq_url': reverse('faq')} - ) + _( + """Sorry, but you don't have enough reputation points to %(action)s.
Please check the faq""" + ) % {'action': action, 'faq_url': reverse('faq')} + ) class CannotDoOnOwnException(CommandException): def __init__(self, action): super(CannotDoOnOwnException, self).__init__( - _("""Sorry but you cannot %(action)s your own post.
Please check the faq""") % {'action': action, 'faq_url': reverse('faq')} - ) + _( + """Sorry but you cannot %(action)s your own post.
Please check the faq""" + ) % {'action': action, 'faq_url': reverse('faq')} + ) class AnonymousNotAllowedException(CommandException): def __init__(self, action): super(AnonymousNotAllowedException, self).__init__( - _("""Sorry but anonymous users cannot %(action)s.
Please login or create an account here.""") % {'action': action, 'signin_url': reverse('auth_signin')} - ) + _( + """Sorry but anonymous users cannot %(action)s.
Please login or create an account here.""" + ) % {'action': action, 'signin_url': reverse('auth_signin')} + ) class NotEnoughLeftException(CommandException): def __init__(self, action, limit): super(NotEnoughLeftException, self).__init__( - _("""Sorry, but you don't have enough %(action)s left for today..
The limit is %(limit)s per day..
Please check the faq""") % {'action': action, 'limit': limit, 'faq_url': reverse('faq')} - ) + _( + """Sorry, but you don't have enough %(action)s left for today..
The limit is %(limit)s per day..
Please check the faq""" + ) % {'action': action, 'limit': limit, 'faq_url': reverse('faq')} + ) class CannotDoubleActionException(CommandException): def __init__(self, action): super(CannotDoubleActionException, self).__init__( - _("""Sorry, but you cannot %(action)s twice the same post.
Please check the faq""") % {'action': action, 'faq_url': reverse('faq')} - ) + _( + """Sorry, but you cannot %(action)s twice the same post.
Please check the faq""" + ) % {'action': action, 'faq_url': reverse('faq')} + ) -@command +@decorate.withfn(command) def vote_post(request, id, vote_type): post = get_object_or_404(Node, id=id).leaf user = request.user @@ -76,8 +86,9 @@ def vote_post(request, id, vote_type): if old_vote.action_date < datetime.datetime.now() - datetime.timedelta(days=int(settings.DENY_UNVOTE_DAYS)): raise CommandException( _("Sorry but you cannot cancel a vote after %(ndays)d %(tdays)s from the original vote") % - {'ndays': int(settings.DENY_UNVOTE_DAYS), 'tdays': ungettext('day', 'days', int(settings.DENY_UNVOTE_DAYS))} - ) + {'ndays': int(settings.DENY_UNVOTE_DAYS), + 'tdays': ungettext('day', 'days', int(settings.DENY_UNVOTE_DAYS))} + ) old_vote.cancel(ip=request.META['REMOTE_ADDR']) score_inc += (old_vote.__class__ == VoteDownAction) and 1 or -1 @@ -89,10 +100,10 @@ def vote_post(request, id, vote_type): vote_type = "none" response = { - 'commands': { - 'update_post_score': [id, score_inc], - 'update_user_post_vote': [id, vote_type] - } + 'commands': { + 'update_post_score': [id, score_inc], + 'update_user_post_vote': [id, vote_type] + } } votes_left = (int(settings.MAX_VOTES_PER_DAY) - user_vote_count_today) + (vote_type == 'none' and -1 or 1) @@ -103,7 +114,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}) @@ -127,7 +138,8 @@ def flag_post(request, id): try: current = FlagAction.objects.get(canceled=False, user=user, node=post) - raise CommandException(_("You already flagged this post with the following reason: %(reason)s") % {'reason': current.extra}) + raise CommandException( + _("You already flagged this post with the following reason: %(reason)s") % {'reason': current.extra}) except ObjectDoesNotExist: reason = request.POST.get('prompt', '').strip() @@ -137,8 +149,8 @@ def flag_post(request, id): FlagAction(user=user, node=post, extra=reason, ip=request.META['REMOTE_ADDR']).save() 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 @@ -150,7 +162,7 @@ def like_comment(request, id): raise CannotDoOnOwnException(_('like')) if not user.can_like_comment(comment): - raise NotEnoughRepPointsException( _('like comments')) + raise NotEnoughRepPointsException( _('like comments')) like = VoteAction.get_action_for(node=comment, user=user) @@ -162,13 +174,13 @@ def like_comment(request, id): likes = True return { - 'commands': { - 'update_post_score': [comment.id, likes and 1 or -1], - 'update_user_post_vote': [comment.id, likes and 'up' or 'none'] - } + 'commands': { + 'update_post_score': [comment.id, likes and 1 or -1], + 'update_user_post_vote': [comment.id, likes and 'up' or 'none'] + } } -@command +@decorate.withfn(command) def delete_comment(request, id): comment = get_object_or_404(Comment, id=id) user = request.user @@ -183,12 +195,12 @@ def delete_comment(request, id): DeleteAction(node=comment, user=user, ip=request.META['REMOTE_ADDR']).save() return { - 'commands': { - 'remove_comment': [comment.id], - } + 'commands': { + 'remove_comment': [comment.id], + } } -@command +@decorate.withfn(command) def mark_favorite(request, id): question = get_object_or_404(Question, id=id) @@ -204,14 +216,13 @@ def mark_favorite(request, id): added = True return { - 'commands': { - 'update_favorite_count': [added and 1 or -1], - 'update_favorite_mark': [added and 'on' or 'off'] - } + 'commands': { + 'update_favorite_count': [added and 1 or -1], + 'update_favorite_mark': [added and 'on' or 'off'] + } } -@decoratable -@command +@decorate.withfn(command) def comment(request, id): post = get_object_or_404(Node, id=id) user = request.user @@ -239,30 +250,33 @@ def comment(request, id): if not user.can_edit_comment(comment): raise NotEnoughRepPointsException( _('edit comments')) - comment = ReviseAction(user=user, node=comment, ip=request.META['REMOTE_ADDR']).save(data=dict(text=comment_text)).node + comment = ReviseAction(user=user, node=comment, ip=request.META['REMOTE_ADDR']).save( + data=dict(text=comment_text)).node else: if not user.can_comment(post): raise NotEnoughRepPointsException( _('comment')) - comment = CommentAction(user=user, ip=request.META['REMOTE_ADDR']).save(data=dict(text=comment_text, parent=post)).node + comment = CommentAction(user=user, ip=request.META['REMOTE_ADDR']).save( + data=dict(text=comment_text, parent=post)).node if comment.active_revision.revision == 1: return { - 'commands': { - 'insert_comment': [ - id, comment.id, comment.comment, user.username, user.get_profile_url(), - reverse('delete_comment', kwargs={'id': comment.id}), reverse('node_markdown', kwargs={'id': comment.id}) + 'commands': { + '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}) ] - } + } } else: return { - 'commands': { - 'update_comment': [comment.id, comment.comment] - } + 'commands': { + 'update_comment': [comment.id, comment.comment] + } } -@command +@decorate.withfn(command) def node_markdown(request, id): user = request.user @@ -273,7 +287,7 @@ def node_markdown(request, id): return HttpResponse(node.body, mimetype="text/plain") -@command +@decorate.withfn(command) def accept_answer(request, id): user = request.user @@ -292,8 +306,9 @@ def accept_answer(request, id): answer.nstate.accepted.cancel(user, ip=request.META['REMOTE_ADDR']) commands['unmark_accepted'] = [answer.id] else: - if question.answer_accepted: - accepted = question.accepted_answer + accepted = question.accepted_answer + + if accepted: accepted.nstate.accepted.cancel(user, ip=request.META['REMOTE_ADDR']) commands['unmark_accepted'] = [accepted.id] @@ -302,7 +317,7 @@ def accept_answer(request, id): return {'commands': commands} -@command +@decorate.withfn(command) def delete_post(request, id): post = get_object_or_404(Node, id=id) user = request.user @@ -325,7 +340,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}) @@ -352,45 +367,44 @@ def close(request, id, close): CloseAction(node=question, user=user, extra=reason, ip=request.META['REMOTE_ADDR']).save() - return { - 'commands': { - 'refresh_page': [] - } - } + return RefreshPageCommand() -@command +@decorate.withfn(command) def wikify(request, id): node = get_object_or_404(Node, id=id) - - if node.nis.wiki: - raise CommandException(_("This post is already marked as community wiky.")) - user = request.user if not user.is_authenticated(): raise AnonymousNotAllowedException(_('mark posts as community wiki')) - if not user.can_wikify(node): - raise NotEnoughRepPointsException(_('mark posts as community wiki')) + if node.nis.wiki: + if not user.can_cancel_wiki(node): + raise NotEnoughRepPointsException(_('cancel a community wiki post')) - WikifyAction(node=node, user=user, ip=request.META['REMOTE_ADDR']).save() + if node.nstate.wiki.action_type == "wikify": + node.nstate.wiki.cancel() + else: + node.nstate.wiki = None + else: + if not user.can_wikify(node): + raise NotEnoughRepPointsException(_('mark posts as community wiki')) - return { - 'commands': { - 'refresh_page': [] - } - } + WikifyAction(node=node, user=user, ip=request.META['REMOTE_ADDR']).save() + + return RefreshPageCommand() -@command +@decorate.withfn(command) def convert_to_comment(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]} + 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)] + [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_comment.html', {'answer': answer, 'nodes': nodes}) @@ -410,13 +424,9 @@ def convert_to_comment(request, id): AnswerToCommentAction(user=user, node=answer, ip=request.META['REMOTE_ADDR']).save(data=dict(new_parent=new_parent)) - return { - 'commands': { - 'refresh_page': [] - } - } + return RefreshPageCommand() -@command +@decorate.withfn(command) def subscribe(request, id): question = get_object_or_404(Question, id=id) @@ -430,10 +440,10 @@ def subscribe(request, id): 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 @@ -459,20 +469,21 @@ def mark_tag(request, tag=None, **kwargs):#tagging system def matching_tags(request): if len(request.GET['q']) == 0: - raise CommandException(_("Invalid request")) + raise CommandException(_("Invalid request")) - possible_tags = Tag.objects.filter(name__istartswith = request.GET['q']) + possible_tags = Tag.active.filter(name__istartswith = request.GET['q']) tag_output = '' for tag in possible_tags: tag_output += (tag.name + "|" + tag.name + "." + tag.used_count.__str__() + "\n") - + return HttpResponse(tag_output, mimetype="text/plain") def related_questions(request): if request.POST and request.POST.get('title', None): 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'])[0:10]]), mimetype="application/json") + for q in Question.objects.search(request.POST['title']).filter_state(deleted=False)[0:10]]), + mimetype="application/json") else: raise Http404()