X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/a64747b1fe3fb30bb05a8d9dcdfad625f7fade04..7f4982393567a5f6827c12a089363d91338f9f13:/forum/views/commands.py diff --git a/forum/views/commands.py b/forum/views/commands.py index e41c2e0..11818ec 100644 --- 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 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 @@ -74,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 @@ -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}), - reverse('node_markdown', kwargs={'id': comment.id}) + reverse('node_markdown', kwargs={'id': comment.id}), + reverse('convert_comment', kwargs={'id': comment.id}), ] } } @@ -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) @@ -436,12 +436,66 @@ def convert_to_comment(request, id): return RefreshPageCommand() @decorate.withfn(command) -def subscribe(request, id, user=0): +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: - user = User.objects.filter(id=user)[0] - if not (user.is_a_super_user_or_staff() or user.is_authenticated()): - raise CommandException(_("You do not have the correct credentials to preform this action.")) + 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 @@ -488,13 +542,25 @@ 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']) @@ -504,9 +570,30 @@ 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) + # 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')) + return render_to_response("node/award_points.html", { 'user' : user, 'awarded_user' : awarded_user, }) + # Display the template + return render_to_response('node/permanent_link.html', { 'url' : url, })