X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/3f75c4f8fab198c3cedb9fcbd97f0339942486f6..22236fb67da2f27ceb35ad138f4d534a4fd08251:/forum/views/commands.py diff --git a/forum/views/commands.py b/forum/views/commands.py index ae773bd..4aa96f8 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 * @@ -548,8 +549,16 @@ def answer_permanent_link(request, 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, }) + 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): @@ -577,9 +586,6 @@ def award_points(request, user_id, answer_id): 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, extra=extra).save(data=dict(value=-points, affected=user)) - - # And give them to the awarded one - AwardPointsAction(user=request.user, extra=extra).save(data=dict(value=points, affected=awarded_user)) + AwardPointsAction(user=request.user, node=answer, extra=extra).save(data=dict(value=points, affected=awarded_user)) return { 'message' : _("You have awarded %s with %d points") % (awarded_user, points) }