From 6f98654766d44d484509f2e628598413587591d1 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Wed, 31 Mar 2021 13:35:25 +0200
Subject: [PATCH] =?UTF-8?q?Rajoute=20un=20lien=20vers=20la=20liste=20des?=
 =?UTF-8?q?=20votant=C2=B7e=C2=B7s=20depuis=20la=20page=20d'admin=20si=20l?=
 =?UTF-8?q?'=C3=A9lection=20n'est=20pas=20d=C3=A9pouill=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 elections/templates/elections/election_admin.html  | 10 +++++++++-
 elections/templates/elections/election_voters.html |  2 +-
 elections/views.py                                 |  3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/elections/templates/elections/election_admin.html b/elections/templates/elections/election_admin.html
index 4ff93fe..e4458cb 100644
--- a/elections/templates/elections/election_admin.html
+++ b/elections/templates/elections/election_admin.html
@@ -57,8 +57,16 @@
 
             {% elif election.end_date < current_time %}
 
-            {# Dépouillement #}
             {% if not election.tallied %}
+            {# Liste des votants #}
+            <a class="dropdown-item" href="{% url 'election.voters' election.pk %}">
+              <span class="icon">
+                <i class="fas fa-list"></i>
+              </span>
+              <span>{% trans "Liste des votant·e·s" %}</span>
+            </a>
+
+            {# Dépouillement #}
             <a class="dropdown-item" href="{% url 'election.tally' election.pk %}">
               <span class="icon">
                 <i class="fas fa-poll-h"></i>
diff --git a/elections/templates/elections/election_voters.html b/elections/templates/elections/election_voters.html
index 5a219ef..821a567 100644
--- a/elections/templates/elections/election_voters.html
+++ b/elections/templates/elections/election_voters.html
@@ -18,7 +18,7 @@
 
   <div class="level-right">
     <div class="level-item">
-      <a class="button is-primary" href="{% url 'election.view' election.pk %}">
+      <a class="button is-primary" href="{% url return_pattern election.pk %}">
         <span class="icon is-small">
           <i class="fas fa-undo-alt"></i>
         </span>
diff --git a/elections/views.py b/elections/views.py
index e2b31da..9265406 100644
--- a/elections/views.py
+++ b/elections/views.py
@@ -435,6 +435,9 @@ class ElectionVotersView(NotArchivedMixin, DetailView):
             and election.end_date < timezone.now()
             and not election.tallied
         )
+        context["return_pattern"] = (
+            "election." + "admin" if context["can_delete"] else "view"
+        )
         return context