From 0666b5288f34c038e34c7472be2ddd1dce024491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Sun, 29 Jan 2017 16:24:07 +0100
Subject: [PATCH] Proper use of messages in survies

---
 .../templates/{ => gestioncof}/survey.html    |  7 ------
 gestioncof/views.py                           | 24 ++++++++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)
 rename gestioncof/templates/{ => gestioncof}/survey.html (69%)

diff --git a/gestioncof/templates/survey.html b/gestioncof/templates/gestioncof/survey.html
similarity index 69%
rename from gestioncof/templates/survey.html
rename to gestioncof/templates/gestioncof/survey.html
index 4d836545..ccf447ef 100644
--- a/gestioncof/templates/survey.html
+++ b/gestioncof/templates/gestioncof/survey.html
@@ -5,13 +5,6 @@
 
 {% block realcontent %}
         <h2>Sondage: {{ survey.title }}</h2>
-        {% if success %}
-            {% if deleted %}
-            <p class="success">Votre réponse a bien été supprimée !</p>
-            {% else %}
-            <p class="success">Votre réponse a bien été enregistrée ! Vous pouvez cependant la modifier jusqu'à la fin du sondage.</p>
-            {% endif %}
-        {% endif %}
         {% if survey.details %}
             <p>{{ survey.details }}</p>
         {% endif %}
diff --git a/gestioncof/views.py b/gestioncof/views.py
index 1945f7f6..2a59bd14 100644
--- a/gestioncof/views.py
+++ b/gestioncof/views.py
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import unicodecsv
 import uuid
 from datetime import timedelta
@@ -16,6 +12,7 @@ from django.contrib.auth.views import login as django_login_view
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 from django.utils import timezone
+from django.contrib import messages
 import django.utils.six as six
 
 from gestioncof.models import Survey, SurveyAnswer, SurveyQuestion, \
@@ -153,10 +150,21 @@ def survey(request, survey_id):
         except SurveyAnswer.DoesNotExist:
             current_answer = None
             form = SurveyForm(survey=survey)
-    return render(request, "survey.html", {"survey": survey, "form": form,
-                                           "success": success,
-                                           "deleted": deleted,
-                                           "current_answer": current_answer})
+    # Messages
+    if success:
+        if deleted:
+            messages.success(request,
+                             "Votre réponse a bien été supprimée")
+        else:
+            messages.success(request,
+                             "Votre réponse a bien été enregistrée ! Vous "
+                             "pouvez cependant la modifier jusqu'à la fin "
+                             "du sondage.")
+    return render(request, "gestioncof/survey.html", {
+        "survey": survey,
+        "form": form,
+        "current_answer": current_answer
+    })
 
 
 def get_event_form_choices(event, form):