On utilise une seule view pour la liste des élections, et on rajoute un bouton pour accéder à l'interface admin si on l'a créée
This commit is contained in:
parent
1bff3290d3
commit
9b470f0220
4 changed files with 19 additions and 70 deletions
|
@ -1,62 +0,0 @@
|
|||
{% extends "base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="level">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<h1 class="title">{% trans "Liste des élections créées" %}</h1>
|
||||
</div>
|
||||
</div>
|
||||
<div class="level-right">
|
||||
<div class="level-item">
|
||||
<a class="button is-light is-outlined is-primary" href={% url 'election.create' %}>
|
||||
<span class="icon">
|
||||
<i class="fas fa-plus"></i>
|
||||
</span>
|
||||
<span>{% trans "Créer une élection" %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
{% for e in election_list %}
|
||||
<div class="message is-primary">
|
||||
<div class="message-header is-size-6 is-radiusless">
|
||||
<div>
|
||||
<span class="mr-2">{{ e.name }}</span>
|
||||
<span class="tag is-primary is-light">{{ e.start_date|date:"d/m/Y H:i" }}</span>
|
||||
<span class="icon has-text-primary-light">
|
||||
<i class="fas fa-long-arrow-alt-right"></i>
|
||||
</span>
|
||||
<span class="tag is-primary is-light">{{ e.end_date|date:"d/m/Y H:i" }}</span>
|
||||
|
||||
{% if e.tallied %}
|
||||
<span class="tag is-success is-light ml-3">{% trans "Élection dépouillée" %}</span>
|
||||
{% endif %}
|
||||
|
||||
{% if e.results_public %}
|
||||
<span class="tag is-info is-light ml-3">{% trans "Élection publiée" %}</span>
|
||||
{% endif %}
|
||||
|
||||
{% if e.archived %}
|
||||
<span class="tag is-danger is-light ml-3">{% trans "Élection archivée" %}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<a class="has-text-primary-light" href="{% url 'election.admin' e.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-tools"></i>
|
||||
</span>
|
||||
<span>{% trans "" %}</span>
|
||||
</a>
|
||||
</div>
|
||||
<p class="message-body">
|
||||
{{ e.description|linebreaksbr }}
|
||||
</p>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
{% endblock %}
|
|
@ -46,6 +46,18 @@
|
|||
{% if e.results_public %}
|
||||
<span class="tag is-info is-light ml-3">{% trans "Élection publiée" %}</span>
|
||||
{% endif %}
|
||||
|
||||
{% if e.archived %}
|
||||
<span class="tag is-danger is-light ml-3">{% trans "Élection archivée" %}</span>
|
||||
{% endif %}
|
||||
|
||||
{% if e.created_by == user %}
|
||||
<a class="has-text-primary-light ml-3" href="{% url 'election.admin' e.pk %}">
|
||||
<span class="icon">
|
||||
<i class="fas fa-cog"></i>
|
||||
</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<p class="message-body">
|
||||
|
|
|
@ -5,7 +5,6 @@ from . import views
|
|||
urlpatterns = [
|
||||
# Admin views
|
||||
path("create/", views.ElectionCreateView.as_view(), name="election.create"),
|
||||
path("created/", views.ElectionCreatedView.as_view(), name="election.created"),
|
||||
path("admin/<int:pk>", views.ElectionAdminView.as_view(), name="election.admin"),
|
||||
path(
|
||||
"mail-voters/<int:pk>",
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
from django.contrib import messages
|
||||
from django.contrib.messages.views import SuccessMessageMixin
|
||||
from django.db.models import Q
|
||||
from django.http import Http404, HttpResponseRedirect
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
|
@ -162,11 +163,6 @@ class ElectionMailVotersView(CreatorOnlyEditMixin, SuccessMessageMixin, FormView
|
|||
return super().form_valid(form)
|
||||
|
||||
|
||||
class ElectionCreatedView(CreatorOnlyMixin, ListView):
|
||||
model = Election
|
||||
template_name = "elections/election_created.html"
|
||||
|
||||
|
||||
class ElectionUpdateView(CreatorOnlyEditMixin, SuccessMessageMixin, UpdateView):
|
||||
model = Election
|
||||
form_class = ElectionForm
|
||||
|
@ -221,7 +217,7 @@ class ElectionChangePublicationView(
|
|||
return super().get(request, *args, **kwargs)
|
||||
|
||||
|
||||
class ElectionArchiveView(CreatorOnlyEditMixin, BackgroundUpdateView):
|
||||
class ElectionArchiveView(CreatorOnlyMixin, SingleObjectMixin, BackgroundUpdateView):
|
||||
model = Election
|
||||
pattern_name = "election.admin"
|
||||
success_message = _("Élection archivée avec succès !")
|
||||
|
@ -346,7 +342,11 @@ class ElectionListView(ListView):
|
|||
template_name = "elections/election_list.html"
|
||||
|
||||
def get_queryset(self):
|
||||
return super().get_queryset().filter(archived=False)
|
||||
return (
|
||||
super()
|
||||
.get_queryset()
|
||||
.filter(Q(archived=False) | Q(created_by=self.request.user))
|
||||
)
|
||||
|
||||
|
||||
class ElectionView(DetailView):
|
||||
|
|
Loading…
Add table
Reference in a new issue