From 3c91771e84b448feec89e2381d672b7af25912c5 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Wed, 25 Aug 2021 15:59:55 +0200
Subject: [PATCH] =?UTF-8?q?Bouton=20de=20retour=20depuis=20la=20liste=20de?=
 =?UTF-8?q?s=20votant=C2=B7e=C2=B7s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 elections/templates/elections/election_admin.html  | 9 +++------
 elections/templates/elections/election_voters.html | 2 +-
 elections/views.py                                 | 1 +
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/elections/templates/elections/election_admin.html b/elections/templates/elections/election_admin.html
index 0c1d697..90ee8f1 100644
--- a/elections/templates/elections/election_admin.html
+++ b/elections/templates/elections/election_admin.html
@@ -108,11 +108,8 @@
           <div class="dropdown is-right">
             <div class="dropdown-trigger">
               <button class="button" aria-haspopup="true" aria-controls="dropdown-menu">
-                <span class="icon-text">
-                  <span class="icon">
-                    <i class="fas fa-cog" aria-hidden="true"></i>
-                  </span>
-                  <span>{% trans "Actions" %}</span>
+                <span class="icon">
+                  <i class="fas fa-cog" aria-hidden="true"></i>
                 </span>
               </button>
             </div>
@@ -170,7 +167,7 @@
 
                 {% if not election.tallied %}
                 {# Liste des votants #}
-                <a class="dropdown-item" href="{% url 'election.voters' election.pk %}">
+                <a class="dropdown-item" href="{% url 'election.voters' election.pk %}?prev=admin">
                   <span class="icon">
                     <i class="fas fa-list"></i>
                   </span>
diff --git a/elections/templates/elections/election_voters.html b/elections/templates/elections/election_voters.html
index ff6bd14..be8bfa9 100644
--- a/elections/templates/elections/election_voters.html
+++ b/elections/templates/elections/election_voters.html
@@ -61,7 +61,7 @@
 
   <div class="level-right">
     <div class="level-item">
-      <a class="button is-primary" href="{% if can_delete %}{% url 'election.admin' election.pk %}{% else %}{% url 'election.view' election.pk %}{% endif %}">
+      <a class="button is-primary" href="{% if from_admin %}{% url 'election.admin' election.pk %}{% else %}{% url 'election.view' election.pk %}{% endif %}">
         <span class="icon">
           <i class="fas fa-undo-alt"></i>
         </span>
diff --git a/elections/views.py b/elections/views.py
index 7138470..05d2a91 100644
--- a/elections/views.py
+++ b/elections/views.py
@@ -437,6 +437,7 @@ class ElectionVotersView(NotArchivedMixin, DetailView):
                 context["d_form"] = DeleteVoteForm()
 
             context["can_delete"] = can_delete
+            context["from_admin"] = self.request.GET.get("prev") == "admin"
         context["voters"] = voters
 
         return context