X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/e1be4a899f22eda7988a0aeb3ee70cbba0fba657..21edf6f0a6ea39897473c38efa2c69f50baa8932:/forum/views/commands.py diff --git a/forum/views/commands.py b/forum/views/commands.py index 7abdbef..62d864f 100644 --- a/forum/views/commands.py +++ b/forum/views/commands.py @@ -1,16 +1,20 @@ # -*- coding: utf-8 -*- import datetime +import json import logging +from urllib import urlencode + from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse -from django.utils import simplejson from django.utils.encoding import smart_unicode from django.utils.translation import ungettext, ugettext as _ -from django.http import HttpResponse, Http404 +from django.http import HttpResponse, HttpResponseRedirect, Http404 from django.shortcuts import get_object_or_404, render_to_response +from django.contrib import messages + from forum.models import * from forum.utils.decorators import ajax_login_required from forum.actions import * @@ -20,7 +24,7 @@ from forum import settings from decorators import command, CommandException, RefreshPageCommand class NotEnoughRepPointsException(CommandException): - def __init__(self, action, user_reputation=None, reputation_required=None): + def __init__(self, action, user_reputation=None, reputation_required=None, node=None): if reputation_required is not None and user_reputation is not None: message = _( """Sorry, but you don't have enough reputation points to %(action)s.
@@ -73,6 +77,10 @@ class CannotDoubleActionException(CommandException): @decorate.withfn(command) def vote_post(request, id, vote_type): + if not request.method == 'POST': + raise CommandException(_("Invalid request")) + + post = get_object_or_404(Node, id=id).leaf user = request.user @@ -85,7 +93,7 @@ def vote_post(request, id, vote_type): if not (vote_type == 'up' and user.can_vote_up() or user.can_vote_down()): reputation_required = int(settings.REP_TO_VOTE_UP) if vote_type == 'up' else int(settings.REP_TO_VOTE_DOWN) action_type = vote_type == 'up' and _('upvote') or _('downvote') - raise NotEnoughRepPointsException(action_type, user_reputation=user.reputation, reputation_required=reputation_required) + raise NotEnoughRepPointsException(action_type, user_reputation=user.reputation, reputation_required=reputation_required, node=post) user_vote_count_today = user.get_vote_count_today() user_can_vote_count_today = user.can_vote_count_today() @@ -176,7 +184,7 @@ def like_comment(request, id): raise CannotDoOnOwnException(_('like')) if not user.can_like_comment(comment): - raise NotEnoughRepPointsException( _('like comments')) + raise NotEnoughRepPointsException( _('like comments'), node=comment) like = VoteAction.get_action_for(node=comment, user=user) @@ -216,17 +224,17 @@ def delete_comment(request, id): @decorate.withfn(command) def mark_favorite(request, id): - question = get_object_or_404(Question, id=id) + node = get_object_or_404(Node, id=id) if not request.user.is_authenticated(): raise AnonymousNotAllowedException(_('mark a question as favorite')) try: - favorite = FavoriteAction.objects.get(canceled=False, node=question, user=request.user) + favorite = FavoriteAction.objects.get(canceled=False, node=node, user=request.user) favorite.cancel(ip=request.META['REMOTE_ADDR']) added = False except ObjectDoesNotExist: - FavoriteAction(node=question, user=request.user, ip=request.META['REMOTE_ADDR']).save() + FavoriteAction(node=node, user=request.user, ip=request.META['REMOTE_ADDR']).save() added = True return { @@ -282,6 +290,7 @@ def comment(request, id): reverse('node_markdown', kwargs={'id': comment.id}), reverse('convert_comment', kwargs={'id': comment.id}), user.can_convert_comment_to_answer(comment), + bool(settings.SHOW_LATEST_COMMENTS_FIRST) ] } } @@ -338,6 +347,21 @@ def accept_answer(request, id): AcceptAnswerAction(node=answer, user=user, ip=request.META['REMOTE_ADDR']).save() + + # If the request is not an AJAX redirect to the answer URL rather than to the home page + if not request.is_ajax(): + msg = _(""" + Congratulations! You've accepted an answer. + """) + + # Notify the user with a message that an answer has been accepted + messages.info(request, msg) + + # Redirect URL should include additional get parameters that might have been attached + redirect_url = answer.parent.get_absolute_url() + "?accepted_answer=true&%s" % smart_unicode(urlencode(request.GET)) + + return HttpResponseRedirect(redirect_url) + commands['mark_accepted'] = [answer.id] return {'commands': commands} @@ -523,7 +547,7 @@ def mark_tag(request, tag=None, **kwargs):#tagging system pass else: ts.update(reason=reason) - return HttpResponse(simplejson.dumps(''), mimetype="application/json") + return HttpResponse(json.dumps(''), mimetype="application/json") def matching_tags(request): if len(request.GET['q']) == 0: @@ -555,7 +579,7 @@ def related_questions(request): if can_rank and isinstance(can_rank, basestring): questions = questions.order_by(can_rank) - return HttpResponse(simplejson.dumps( + return HttpResponse(json.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: @@ -595,7 +619,11 @@ def award_points(request, user_id, answer_id): raise AnonymousNotAllowedException(_('award')) if not request.POST: - return render_to_response("node/award_points.html", { 'user' : user, 'awarded_user' : awarded_user, }) + return render_to_response("node/award_points.html", { + 'user' : user, + 'awarded_user' : awarded_user, + 'reputation_to_comment' : str(settings.REP_TO_COMMENT) + }) else: points = int(request.POST['points']) @@ -612,3 +640,4 @@ def award_points(request, user_id, answer_id): 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} } +