From 1cafa2aedd747676c7a8fd99475f0212e519714d Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Thu, 24 Dec 2020 01:10:05 +0100
Subject: [PATCH] Small tweaks and filters

---
 elections/templates/elections/election_admin.html | 2 +-
 elections/templates/elections/upload_voters.html  | 2 +-
 elections/views.py                                | 9 +++++++++
 shared/templates/base.html                        | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/elections/templates/elections/election_admin.html b/elections/templates/elections/election_admin.html
index 2449f06..acf2a8c 100644
--- a/elections/templates/elections/election_admin.html
+++ b/elections/templates/elections/election_admin.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 
-<div class="level">
+<div class="level is-block-tablet is-block-desktop is-flex-fullhd">
   <div class="level-left">
     {# Titre de l'élection #}
     <div class="level-item">
diff --git a/elections/templates/elections/upload_voters.html b/elections/templates/elections/upload_voters.html
index 6798bad..d7873c5 100644
--- a/elections/templates/elections/upload_voters.html
+++ b/elections/templates/elections/upload_voters.html
@@ -19,7 +19,7 @@
 
 {% block content %}
 
-<div class="level">
+<div class="level is-flex-widescreen">
   <div class="level-left">
     <div class="item-level">
       <h1 class="title">{% trans "Gestion de la liste de votant·e·s" %}</h1>
diff --git a/elections/views.py b/elections/views.py
index 0076354..b3a800c 100644
--- a/elections/views.py
+++ b/elections/views.py
@@ -94,6 +94,10 @@ class ElectionUploadVotersView(CreatorOnlyEditMixin, SuccessMessageMixin, FormVi
     success_message = _("Liste de votant·e·s importée avec succès !")
     template_name = "elections/upload_voters.html"
 
+    def get_queryset(self):
+        # On ne peut ajouter une liste d'électeurs que sur une élection restreinte
+        return super().get_queryset().filter(restricted=True)
+
     def get_success_url(self):
         return reverse("election.upload-voters", args=[self.object.pk])
 
@@ -124,6 +128,11 @@ class ElectionMailVotersView(CreatorOnlyEditMixin, SuccessMessageMixin, FormView
     success_message = _("Mail d'annonce envoyé avec succès !")
     template_name = "elections/mail_voters.html"
 
+    def get_queryset(self):
+        # On ne peut envoyer un mail que sur une élection restreinte qui n'a pas
+        # déjà vu son mail envoyé
+        return super().get_queryset().filter(restricted=True, sent_mail=False)
+
     def get_success_url(self):
         return reverse("election.upload-voters", args=[self.object.pk])
 
diff --git a/shared/templates/base.html b/shared/templates/base.html
index 3de407a..e1624d6 100644
--- a/shared/templates/base.html
+++ b/shared/templates/base.html
@@ -79,7 +79,7 @@
   {% block layout %}
   <div class="main-content">
     <div class="columns is-centered">
-      <div class="column is-two-thirds">
+      <div class="column is-two-thirds-fullhd is-12-desktop is-12-widescreen">
         <section class="section pt-3">
 
           {% if messages %}