From efea92b5d22adc3fc2dc29f07ba62dbd44cec9d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Sun, 29 Jan 2017 22:49:32 +0100 Subject: [PATCH] Proper use of messages in places --- bda/templates/{ => bda}/resume_places.html | 3 --- bda/views.py | 9 ++++++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename bda/templates/{ => bda}/resume_places.html (83%) diff --git a/bda/templates/resume_places.html b/bda/templates/bda/resume_places.html similarity index 83% rename from bda/templates/resume_places.html rename to bda/templates/bda/resume_places.html index 614a1656..3785169b 100644 --- a/bda/templates/resume_places.html +++ b/bda/templates/bda/resume_places.html @@ -2,9 +2,6 @@ {% block realcontent %}

Places attribuées

- {% if warning %} -

Attention, vous avez reçu plusieurs places pour des spectacles différents à la même date !

- {% endif %} {% if places %} {% for place in places %} diff --git a/bda/views.py b/bda/views.py index ddd2fc90..039e0ec7 100644 --- a/bda/views.py +++ b/bda/views.py @@ -112,12 +112,15 @@ def places(request, tirage_id): warning = True else: dates.append(date) - return render(request, "resume_places.html", + # On prévient l'utilisateur s'il a deux places à la même date + if warning: + messages.warning(request, "Attention, vous avez reçu des places pour " + "des spectacles différents à la même date.") + return render(request, "bda/resume_places.html", {"participant": participant, "places": filtered_places, "tirage": tirage, - "total": total, - "warning": warning}) + "total": total}) @cof_required