X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/133a8f939cdfa69dd6a7caeafed158aa38d20092..f32668123bbf48a0b73e90024bc09aa60e903ea0:/forum/views/commands.py?ds=sidebyside diff --git a/forum/views/commands.py b/forum/views/commands.py index e2942bd..aeb01e5 100644 --- a/forum/views/commands.py +++ b/forum/views/commands.py @@ -1,70 +1,66 @@ import datetime -from django.conf import settings +from forum import settings from django.core.exceptions import ObjectDoesNotExist from django.utils import simplejson -from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden +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.forms import CloseForm +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 +from decorators import command, CommandException, RefreshPageCommand +from forum.modules import decorate +from forum import settings import logging -class NotEnoughRepPointsException(Exception): +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(Exception): +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(Exception): +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(Exception): +class NotEnoughLeftException(CommandException): def __init__(self, action, limit): - super(NotEnoughRepPointsException, 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')}) - ) - -class CannotDoubleActionException(Exception): + 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')} + ) + +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) - vote_score = vote_type == 'up' and 1 or -1 + post = get_object_or_404(Node, id=id).leaf user = request.user if not user.is_authenticated(): @@ -77,43 +73,51 @@ 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)) - try: - vote = post.votes.get(canceled=False, user=user) + new_vote_cls = (vote_type == 'up') and VoteUpAction or VoteDownAction + score_inc = 0 + + old_vote = VoteAction.get_action_for(node=post, user=user) - if vote.voted_at < datetime.datetime.now() - datetime.timedelta(days=int(settings.DENY_UNVOTE_DAYS)): - raise Exception( + if old_vote: + 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))} + ) - vote.cancel() - vote_type = 'none' - except ObjectDoesNotExist: - #there is no vote yet - vote = Vote(user=user, node=post, vote=vote_score) - vote.save() + old_vote.cancel(ip=request.META['REMOTE_ADDR']) + 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': { - 'update_post_score': [id, vote.vote * (vote_type == 'none' and -1 or 1)], - '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) + 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) %(tvotes) left today.") % \ + response['message'] = _("You have %(nvotes)s %(tvotes)s left today.") % \ {'nvotes': votes_left, 'tvotes': ungettext('vote', 'votes', votes_left)} 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}) + post = get_object_or_404(Node, id=id) user = request.user @@ -132,15 +136,20 @@ def flag_post(request, id): raise NotEnoughLeftException(_('flags'), str(settings.MAX_FLAGS_PER_DAY)) try: - post.flaggeditems.get(user=user) - raise CannotDoubleActionException(_('flag')) + 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}) except ObjectDoesNotExist: - flag = FlaggedItem(user=user, content_object=post) - flag.save() + reason = request.POST.get('prompt', '').strip() + + if not len(reason): + raise CommandException(_("Reason is empty")) + + 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.")} - return {} - -@command +@decorate.withfn(command) def like_comment(request, id): comment = get_object_or_404(Comment, id=id) user = request.user @@ -152,25 +161,25 @@ def like_comment(request, id): raise CannotDoOnOwnException(_('like')) if not user.can_like_comment(comment): - raise NotEnoughRepPointsException( _('like comments')) + raise NotEnoughRepPointsException( _('like comments')) - try: - like = LikedComment.active.get(comment=comment, user=user) - like.cancel() + like = VoteAction.get_action_for(node=comment, user=user) + + if like: + like.cancel(ip=request.META['REMOTE_ADDR']) likes = False - except ObjectDoesNotExist: - like = LikedComment(comment=comment, user=user) - like.save() + else: + VoteUpCommentAction(node=comment, user=user, ip=request.META['REMOTE_ADDR']).save() likes = True return { - 'commands': { - 'update_comment_score': [comment.id, likes and 1 or -1], - 'update_likes_comment_mark': [comment.id, likes and 'on' or 'off'] - } + '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 @@ -181,15 +190,16 @@ def delete_comment(request, id): if not user.can_delete_comment(comment): raise NotEnoughRepPointsException( _('delete comments')) - comment.mark_deleted(user) + if not comment.nis.deleted: + 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) @@ -197,22 +207,21 @@ def mark_favorite(request, id): raise AnonymousNotAllowedException(_('mark a question as favorite')) try: - favorite = FavoriteQuestion.objects.get(question=question, user=request.user) - favorite.delete() + favorite = FavoriteAction.objects.get(canceled=False, node=question, user=request.user) + favorite.cancel(ip=request.META['REMOTE_ADDR']) added = False except ObjectDoesNotExist: - favorite = FavoriteQuestion(question=question, user=request.user) - favorite.save() + FavoriteAction(node=question, user=request.user, ip=request.META['REMOTE_ADDR']).save() 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'] + } } -@command +@decorate.withfn(command) def comment(request, id): post = get_object_or_404(Node, id=id) user = request.user @@ -221,44 +230,69 @@ def comment(request, id): raise AnonymousNotAllowedException(_('comment')) if not request.method == 'POST': - raise Exception(_("Invalid request")) + raise CommandException(_("Invalid request")) + + comment_text = request.POST.get('comment', '').strip() + + if not len(comment_text): + raise CommandException(_("Comment is empty")) + + if len(comment_text) < settings.FORM_MIN_COMMENT_BODY: + raise CommandException(_("At least %d characters required on comment body.") % settings.FORM_MIN_COMMENT_BODY) + + if len(comment_text) > settings.FORM_MAX_COMMENT_BODY: + raise CommandException(_("No more than %d characters on comment body.") % settings.FORM_MAX_COMMENT_BODY) if 'id' in request.POST: comment = get_object_or_404(Comment, id=request.POST['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 else: if not user.can_comment(post): raise NotEnoughRepPointsException( _('comment')) - comment = Comment(parent=post) - - comment_text = request.POST.get('comment', '').strip() - - if not len(comment_text): - raise Exception(_("Comment is empty")) - - comment.create_revision(user, body=comment_text) + 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_text, user.username, user.get_profile_url(), reverse('delete_comment', 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}), + reverse('convert_comment', kwargs={'id': comment.id}), + user.can_convert_comment_to_answer(comment), ] - } + } } else: return { - 'commands': { - 'update_comment': [comment.id, comment.comment] - } + 'commands': { + 'update_comment': [comment.id, comment.comment] + } } +@decorate.withfn(command) +def node_markdown(request, id): + user = request.user -@command + if not user.is_authenticated(): + raise AnonymousNotAllowedException(_('accept answers')) + + node = get_object_or_404(Node, id=id) + return HttpResponse(node.active_revision.body, mimetype="text/plain") + + +@decorate.withfn(command) def accept_answer(request, id): + if settings.DISABLE_ACCEPTING_FEATURE: + raise Http404() + user = request.user if not user.is_authenticated(): @@ -268,25 +302,32 @@ def accept_answer(request, id): question = answer.question if not user.can_accept_answer(answer): - raise Exception(_("Sorry but only the question author can accept an answer")) + raise CommandException(_("Sorry but you cannot accept the answer")) commands = {} - if answer.accepted: - answer.unmark_accepted(user) + if answer.nis.accepted: + answer.nstate.accepted.cancel(user, ip=request.META['REMOTE_ADDR']) commands['unmark_accepted'] = [answer.id] else: - if question.accepted_answer is not None: - accepted = question.accepted_answer - accepted.unmark_accepted(user) - commands['unmark_accepted'] = [accepted.id] + 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))) - answer.mark_accepted(user) + + 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 @@ -297,32 +338,154 @@ def delete_post(request, id): if not (user.can_delete_post(post)): raise NotEnoughRepPointsException(_('delete posts')) - post.mark_deleted(user) + ret = {'commands': {}} - return { - 'commands': { - 'mark_deleted': [post.node_type, id] - } - } + if post.nis.deleted: + post.nstate.deleted.cancel(user, ip=request.META['REMOTE_ADDR']) + ret['commands']['unmark_deleted'] = [post.node_type, id] + else: + DeleteAction(node=post, user=user, ip=request.META['REMOTE_ADDR']).save() + + ret['commands']['mark_deleted'] = [post.node_type, id] + + return ret + +@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}) + + question = get_object_or_404(Question, id=id) + user = request.user + + if not user.is_authenticated(): + raise AnonymousNotAllowedException(_('close questions')) + + if question.nis.closed: + if not user.can_reopen_question(question): + raise NotEnoughRepPointsException(_('reopen questions')) + + question.nstate.closed.cancel(user, ip=request.META['REMOTE_ADDR']) + else: + if not request.user.can_close_question(question): + raise NotEnoughRepPointsException(_('close questions')) + + reason = request.POST.get('prompt', '').strip() + + if not len(reason): + raise CommandException(_("Reason is empty")) + + CloseAction(node=question, user=user, extra=reason, ip=request.META['REMOTE_ADDR']).save() + + return RefreshPageCommand() + +@decorate.withfn(command) +def wikify(request, id): + node = get_object_or_404(Node, id=id) + user = request.user + + if not user.is_authenticated(): + raise AnonymousNotAllowedException(_('mark posts as community wiki')) + + if node.nis.wiki: + if not user.can_cancel_wiki(node): + raise NotEnoughRepPointsException(_('cancel a community wiki post')) + + 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')) + + WikifyAction(node=node, user=user, ip=request.META['REMOTE_ADDR']).save() + + return RefreshPageCommand() + +@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]} + 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_comment.html', {'answer': answer, 'nodes': nodes}) + + if not user.is_authenticated(): + raise AnonymousNotAllowedException(_("convert answers to comments")) + + if not user.can_convert_to_comment(answer): + raise NotEnoughRepPointsException(_("convert answers to comments")) + + try: + new_parent = Node.objects.get(id=request.POST.get('under', None)) + except: + raise CommandException(_("That is an invalid post to put the comment under")) + + if not (new_parent == question or (new_parent.node_type == 'answer' and new_parent.parent == question)): + raise CommandException(_("That is an invalid post to put the comment under")) + + AnswerToCommentAction(user=user, node=answer, ip=request.META['REMOTE_ADDR']).save(data=dict(new_parent=new_parent)) + + return RefreshPageCommand() + +@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 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 -@command -def subscribe(request, id): 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': [''] - } + 'set_subscription_button': [subscribed and _('unsubscribe me') or _('subscribe me')], + 'set_subscription_status': [''] + } } #internally grouped views - used by the tagging system @@ -346,72 +509,90 @@ def mark_tag(request, tag=None, **kwargs):#tagging system ts.update(reason=reason) return HttpResponse(simplejson.dumps(''), mimetype="application/json") -@ajax_login_required -def ajax_toggle_ignored_questions(request):#ajax tagging and tag-filtering system - if request.user.hide_ignored_questions: - new_hide_setting = False - else: - new_hide_setting = True - request.user.hide_ignored_questions = new_hide_setting - request.user.save() - -@ajax_method -def ajax_command(request):#refactor? view processing ajax commands - note "vote" and view others do it too - if 'command' not in request.POST: - return HttpResponseForbidden(mimetype="application/json") - if request.POST['command'] == 'toggle-ignored-questions': - return ajax_toggle_ignored_questions(request) - -@login_required -def close(request, id):#close question - """view to initiate and process - question close - """ - question = get_object_or_404(Question, id=id) - if not request.user.can_close_question(question): - return HttpResponseForbidden() - if request.method == 'POST': - form = CloseForm(request.POST) - if form.is_valid(): - reason = form.cleaned_data['reason'] - question.closed = True - question.closed_by = request.user - question.closed_at = datetime.datetime.now() - question.close_reason = reason - question.save() - return HttpResponseRedirect(question.get_absolute_url()) +def matching_tags(request): + if len(request.GET['q']) == 0: + raise CommandException(_("Invalid request")) + + possible_tags = Tag.active.filter(name__icontains = request.GET['q']) + tag_output = '' + for tag in possible_tags: + 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']) + + 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: - form = CloseForm() - return render_to_response('close.html', { - 'form' : form, - 'question' : question, - }, context_instance=RequestContext(request)) - -@login_required -def reopen(request, id):#re-open question - """view to initiate and process - question close - """ - question = get_object_or_404(Question, id=id) - # open question - if not request.user.can_reopen_question(question): - return HttpResponseForbidden() - if request.method == 'POST' : - Question.objects.filter(id=question.id).update(closed=False, - closed_by=None, closed_at=None, close_reason=None) - return HttpResponseRedirect(question.get_absolute_url()) + 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: - return render_to_response('reopen.html', { - 'question' : question, - }, context_instance=RequestContext(request)) + 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")) -#osqa-user communication system -def read_message(request):#marks message a read - if request.method == "POST": - if request.POST['formdata'] == 'required': - request.session['message_silent'] = 1 - if request.user.is_authenticated(): - request.user.delete_messages() - return HttpResponse('') + 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} }