setop/agenda_culturel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

On ajoute des boutons pour continuer la modération quand on modère

Browse Source 
Fix #314
This commit is contained in:
Jean-Marie Favreau 2025-03-09 14:02:18 +01:00
parent ea129db89f
commit e0a11631c0
2 changed files with 109 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/agenda_culturel/templates/agenda_culturel/event_form.html
View File

@ -60,6 +60,10 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% load static_content_extra %} {% load static_content_extra %}
{% if form.is_clone_from_url or form.is_simple_clone_from_url %}
{% url "add_event_details" as urlparam %}
{% endif %}
<form method="post" action="{{ urlparam }}" enctype="multipart/form-data">
{% if object %} {% if object %}
<article> <article>
<header> <header>
@ -132,30 +136,39 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
</header> </header>
{% if form.is_clone_from_url or form.is_simple_clone_from_url %}
{% url "add_event_details" as urlparam %}
{% endif %}
<form method="post" action="{{ urlparam }}" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
{{ form.media }} {{ form.media }}
{{ form }} {{ form }}
{% if not object %}
<div class="grid buttons stick-bottom"> <div class="grid buttons stick-bottom">
<a href="{% if request.META.HTTP_REFERER %}{{ request.META.HTTP_REFERER }}{% else %}{{ object.get_absolute_url }}{% endif %}" <a href="{% if request.META.HTTP_REFERER %}{{ request.META.HTTP_REFERER }}{% else %}{{ object.get_absolute_url }}{% endif %}"
role="button" role="button"
class="secondary">Annuler</a> class="secondary">Annuler</a>
{% if form.is_simple_clone_from_url %} {% if form.is_simple_clone_from_url %}
<input type="submit" value="Dupliquer et modérer"> <input type="submit" value="Dupliquer">
{% else %} {% else %}
<input type="submit" <input type="submit" value="Enregistrer">
value="Enregistrer{% if form.is_clone_from_url %} et modérer{% endif %}">
{% endif %} {% endif %}
</div> </div>
</form> {% endif %}
</article> </article>
{% if object %} {% if object %}
</article>
</div> </div>
<div class="grid buttons">
<a href="{% if request.META.HTTP_REFERER %}{{ request.META.HTTP_REFERER }}{% else %}{{ object.get_absolute_url }}{% endif %}"
role="button"
class="secondary">Annuler</a>
<input type="submit" value="Enregistrer">
<input type="submit"
value="Enregistrer et passer au suivant &gt;"
name="save_and_next">
<a href="{% url 'moderate_event_next' event.pk %}"
class="secondary"
role="button">Passer au suivant sans enregistrer &gt;</a>
</div>
</article>
{% endif %} {% endif %}
</form>
<script> <script>
const element = document.querySelector('#id_exact_location'); const element = document.querySelector('#id_exact_location');
const choices = new Choices(element, {searchResultLimit: 10}); const choices = new Choices(element, {searchResultLimit: 10});

9
src/agenda_culturel/views.py
View File

@ -509,6 +509,12 @@ class EventUpdateView(
return result return result
def get_success_url(self):
if "save_and_next" in self.request.POST:
return reverse_lazy("moderate_event_next", args=[self.object.pk])
else:
return self.object.get_absolute_url()
class EventModerateView( class EventModerateView(
SuccessMessageMixin, SuccessMessageMixin,
@ -774,6 +780,9 @@ class EventCreateView(SuccessMessageMixin, CreateView):
def get_success_url(self): def get_success_url(self):
if self.request.user.is_authenticated: if self.request.user.is_authenticated:
if "save_and_next" in self.request.POST:
return reverse_lazy("moderate_event_next", args=[self.object.pk])
else:
return self.object.get_absolute_url() return self.object.get_absolute_url()
else: else:
return reverse_lazy("home") return reverse_lazy("home")