diff --git a/polynum/base/models/request.py b/polynum/base/models/request.py index 399935b..3cdb2cb 100644 --- a/polynum/base/models/request.py +++ b/polynum/base/models/request.py @@ -16,6 +16,8 @@ from django.core import validators from django.template import Template, Context from django.core.mail import EmailMessage from django.utils.timezone import now +from django.core.urlresolvers import reverse +from django.conf import settings from ... import utils from .. import app_settings @@ -322,6 +324,7 @@ class Request(models.Model): 'comment': description, 'history': history, 'reversed_history': reversed(history), + 'request_url': settings.SITE_URL + self.get_absolute_url(), } ctx = Context(ctx) logger.info('action %s par %s avec le commentaire %s sur la demande %s', @@ -396,6 +399,9 @@ class Request(models.Model): def __unicode__(self): return '' % (self.pk,) + def get_absolute_url(self): + return reverse('request_detail', kwargs={'pk': self.pk}) + class HistoryManager(models.Manager): def start(self): try: diff --git a/polynum/base/templates/admin/base/mailnotification/change_form.html b/polynum/base/templates/admin/base/mailnotification/change_form.html index 4fc18a9..d43845e 100644 --- a/polynum/base/templates/admin/base/mailnotification/change_form.html +++ b/polynum/base/templates/admin/base/mailnotification/change_form.html @@ -15,7 +15,7 @@ {{request}}la demande {{request.request_number}}le numéro de la demande {{request.user}}l'utilisateur qui a fait la demande - {% url 'request_detail' pk=request.pk %}l'URL de la demande + {{request_url}}l'URL de la demande {{history}}l'historique de la demande dans l'ordre chornologique {{history.0}}la première ligne de l'historique {{history.0}}la première ligne de l'historique diff --git a/polynum/request/views.py b/polynum/request/views.py index f42cb2e..35cd132 100644 --- a/polynum/request/views.py +++ b/polynum/request/views.py @@ -356,12 +356,7 @@ def request_action(request, pk, workflow_pk): return redirect('list_request') if workflow.comment and not request.POST.get('comment'): return render(request, 'request_action.html', locals()) - old_script_prefix = get_script_prefix() - try: - set_script_prefix(settings.SITE_URL) - poly_request.act(request.user, workflow, description=request.POST.get('comment')) - finally: - set_script_prefix(old_script_prefix) + poly_request.act(request.user, workflow, description=request.POST.get('comment')) if workflow.action.ui_message: messages.info(request, mark_safe(workflow.action.ui_message)) if workflow.is_edit: