Compare commits

...

1 Commits

Author SHA1 Message Date
Jean-Marie Favreau
f4c9514048 On renomme "moderation" en "recent" (plus logique) 2024-11-13 11:01:27 +01:00
7 changed files with 9 additions and 9 deletions

View File

@ -36,7 +36,7 @@
<article> <article>
<header> <header>
<div class="slide-buttons"> <div class="slide-buttons">
<a href="{% url 'moderation' %}" role="button">Voir tout {% picto_from_name "chevron-right" %}</a> <a href="{% url 'recent' %}" role="button">Voir tout {% picto_from_name "chevron-right" %}</a>
</div> </div>
<h2>Derniers événements soumis</h2> <h2>Derniers événements soumis</h2>
</header> </header>

View File

@ -20,7 +20,7 @@
<header> <header>
<div class="buttons left-buttons"> <div class="buttons left-buttons">
<a href="{% url 'recurrent_imports' %}" role="button">&lt; Tous les imports récurrents</a> <a href="{% url 'recurrent_imports' %}" role="button">&lt; Tous les imports récurrents</a>
<a href="{% url 'moderation' %}?import_sources={{ object.pk }}" role="button">Voir les événements {% picto_from_name "calendar" %}</a> <a href="{% url 'recent' %}?import_sources={{ object.pk }}" role="button">Voir les événements {% picto_from_name "calendar" %}</a>
</div> </div>
<div class="buttons slide-buttons"> <div class="buttons slide-buttons">
<a href="{% url 'run_rimport' object.pk %}" role="button">Exécuter {% picto_from_name "download-cloud" %}</a> <a href="{% url 'run_rimport' object.pk %}" role="button">Exécuter {% picto_from_name "download-cloud" %}</a>

View File

@ -44,7 +44,7 @@
</footer> </footer>
</article> </article>
{% include "agenda_culturel/side-nav.html" with current="moderation" %} {% include "agenda_culturel/side-nav.html" with current="recent" %}
</div> </div>
{% endblock %} {% endblock %}

View File

@ -15,7 +15,7 @@
<nav> <nav>
<ul> <ul>
{% if perms.agenda_culturel.change_event %} {% if perms.agenda_culturel.change_event %}
<li><a {% if current == "moderation" %}class="selected" {% endif %}href="{% url 'moderation' %}">Derniers événements soumis</a>{% show_badges_events "left" %}</li> <li><a {% if current == "recent" %}class="selected" {% endif %}href="{% url 'recent' %}">Derniers événements soumis</a>{% show_badges_events "left" %}</li>
{% endif %} {% endif %}
{% if perms.agenda_culturel.change_duplicatedevents %} {% if perms.agenda_culturel.change_duplicatedevents %}
<li><a {% if current == "duplicates" %}class="selected" {% endif %}href="{% url 'duplicates' %}">Gestion des doublons</a>{% show_badge_duplicated "left" %}</li> <li><a {% if current == "duplicates" %}class="selected" {% endif %}href="{% url 'duplicates' %}">Gestion des doublons</a>{% show_badge_duplicated "left" %}</li>

View File

@ -70,7 +70,7 @@ def show_badges_events(placement="top"):
if nb_drafts != 0: if nb_drafts != 0:
return mark_safe( return mark_safe(
'<a href="' '<a href="'
+ reverse_lazy("moderation") + reverse_lazy("recent")
+ '?status=draft" class="badge" data-placement="' + '?status=draft" class="badge" data-placement="'
+ placement + placement
+ '" data-tooltip="' + '" data-tooltip="'

View File

@ -23,7 +23,7 @@ urlpatterns = [
path("tag/<int:pk>/edit", TagUpdateView.as_view(), name="edit_tag"), path("tag/<int:pk>/edit", TagUpdateView.as_view(), name="edit_tag"),
path("tag/<int:pk>/delete", TagDeleteView.as_view(), name="delete_tag"), path("tag/<int:pk>/delete", TagDeleteView.as_view(), name="delete_tag"),
path("tags/add", TagCreateView.as_view(), name="add_tag"), path("tags/add", TagCreateView.as_view(), name="add_tag"),
path("moderation/", moderation, name="moderation"), path("recent/", recent, name="recent"),
path("administration/", administration, name="administration"), path("administration/", administration, name="administration"),
path("activite/", activite, name="activite"), path("activite/", activite, name="activite"),
path( path(

View File

@ -595,7 +595,7 @@ class EventDeleteView(
): ):
model = Event model = Event
permission_required = "agenda_culturel.delete_event" permission_required = "agenda_culturel.delete_event"
success_url = reverse_lazy("moderation") success_url = reverse_lazy("recent")
success_message = _("The event has been successfully deleted.") success_message = _("The event has been successfully deleted.")
@ -1070,7 +1070,7 @@ def administration(request):
@login_required(login_url="/accounts/login/") @login_required(login_url="/accounts/login/")
@permission_required("agenda_culturel.view_event") @permission_required("agenda_culturel.view_event")
def moderation(request): def recent(request):
filter = EventFilterAdmin( filter = EventFilterAdmin(
request.GET, queryset=Event.objects.all().order_by("-created_date") request.GET, queryset=Event.objects.all().order_by("-created_date")
) )
@ -1087,7 +1087,7 @@ def moderation(request):
return render( return render(
request, request,
"agenda_culturel/moderation.html", "agenda_culturel/recent.html",
{"filter": filter, "paginator_filter": response}, {"filter": filter, "paginator_filter": response},
) )