X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/c72f65e13db0229d8f5f74b69dc9bdba88d55d75..42651c00f2a66cefa8d3a679b97edc1c0aca8418:/forum/views/commands.py diff --git a/forum/views/commands.py b/forum/views/commands.py index 4fba05f..aeb01e5 100644 --- a/forum/views/commands.py +++ b/forum/views/commands.py @@ -6,6 +6,7 @@ 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 +from django.template.loader import render_to_string from forum.models import * from forum.models.node import NodeMetaClass from forum.actions import * @@ -72,8 +73,9 @@ def vote_post(request, id, vote_type): raise NotEnoughRepPointsException(vote_type == 'up' and _('upvote') or _('downvote')) user_vote_count_today = user.get_vote_count_today() + user_can_vote_count_today = user.can_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 @@ -90,13 +92,11 @@ def vote_post(request, id, vote_type): ) old_vote.cancel(ip=request.META['REMOTE_ADDR']) - score_inc += (old_vote.__class__ == VoteDownAction) and 1 or -1 - - if old_vote.__class__ != new_vote_cls: - new_vote_cls(user=user, node=post, ip=request.META['REMOTE_ADDR']).save() - score_inc += (new_vote_cls == VoteUpAction) and 1 or -1 - else: + score_inc = (old_vote.__class__ == VoteDownAction) and 1 or -1 vote_type = "none" + else: + new_vote_cls(user=user, node=post, ip=request.META['REMOTE_ADDR']).save() + score_inc = (new_vote_cls == VoteUpAction) and 1 or -1 response = { 'commands': { @@ -105,7 +105,7 @@ def vote_post(request, id, vote_type): } } - votes_left = (int(settings.MAX_VOTES_PER_DAY) - user_vote_count_today) + (vote_type == 'none' and -1 or 1) + votes_left = (user_can_vote_count_today - user_vote_count_today) + (vote_type == 'none' and -1 or 1) if int(settings.START_WARN_VOTES_LEFT) >= votes_left: response['message'] = _("You have %(nvotes)s %(tvotes)s left today.") % \ @@ -264,7 +264,9 @@ 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}), + user.can_convert_comment_to_answer(comment), ] } } @@ -283,7 +285,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) @@ -435,32 +437,23 @@ def convert_to_comment(request, id): return RefreshPageCommand() @decorate.withfn(command) -def convert_to_question(request, id): +def convert_comment_to_answer(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}) + 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 answers to questions")) - - if not user.can_convert_to_question(answer): - raise NotEnoughRepPointsException(_("convert answers to questions")) + raise AnonymousNotAllowedException(_("convert comments to answers")) - 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)) + 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() @@ -542,15 +535,64 @@ def matching_users(request): def related_questions(request): if request.POST and request.POST.get('title', None): can_rank, questions = Question.objects.search(request.POST['title']) + + if can_rank and isinstance(can_rank, basestring): + questions = questions.order_by(can_rank) + return HttpResponse(simplejson.dumps( [dict(title=q.title, url=q.get_absolute_url(), score=q.score, summary=q.summary) for q in questions.filter_state(deleted=False)[0:10]]), mimetype="application/json") 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()) + + if not request.POST: + # Display the template + return render_to_response('node/permanent_link.html', { 'url' : url, }) + return { + 'commands' : { + 'copy_url' : [request.POST['permanent_link_url'],], + }, + 'message' : _("The permanent URL to the answer has been copied to your clipboard."), + } + +@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 points < 0: + raise CommandException(_("The number of points to award needs to be a positive value.")) + 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 + AwardPointsAction(user=request.user, node=answer, extra=extra).save(data=dict(value=points, affected=awarded_user)) + return { 'message' : _("You have awarded %(awarded_user)s with %(points)d points") % {'awarded_user' : awarded_user, 'points' : points} }