From b25ae9e3541f86bef85ecb492b2a0eb2f9a30ce9 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Wed, 12 Feb 2025 12:17:41 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20probl=C3=A8me=20page=20messages=20Fix=20#?= =?UTF-8?q?305?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/filters.py | 5 +++-- src/agenda_culturel/static/style.scss | 10 ++++++++++ .../templates/agenda_culturel/messages.html | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/agenda_culturel/filters.py b/src/agenda_culturel/filters.py index 712dcfe..ddcba66 100644 --- a/src/agenda_culturel/filters.py +++ b/src/agenda_culturel/filters.py @@ -414,6 +414,9 @@ class MessagesFilterAdmin(django_filters.FilterSet): model = Message fields = ["closed", "spam", "message_type"] + def is_contact_messages(self): + return "message_type" in self.form.cleaned_data and "contact_form" in self.form.cleaned_data["message_type"] + class SimpleSearchEventFilter(django_filters.FilterSet): q = django_filters.CharFilter(method="custom_filter", @@ -478,8 +481,6 @@ class SimpleSearchEventFilter(django_filters.FilterSet): if not kwargs["request"].user.is_authenticated: self.form.fields.pop("status") - def is_contact_messages(self): - return "message_type" in self.form.cleaned_data and "contact_form" in self.form.cleaned_data["message_type"] class SearchEventFilter(django_filters.FilterSet): diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index 3ee0b9c..641fbfc 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -641,6 +641,16 @@ header .remarque { grid-column: 1/3; } } +.form.recent.messages { + div:nth-child(2) { + grid-column: 1/2; + } + div:nth-last-child(3) { + grid-column: 2/3; + grid-row: 1/3; + } + +} #search { form { diff --git a/src/agenda_culturel/templates/agenda_culturel/messages.html b/src/agenda_culturel/templates/agenda_culturel/messages.html index 78bb943..f27710a 100644 --- a/src/agenda_culturel/templates/agenda_culturel/messages.html +++ b/src/agenda_culturel/templates/agenda_culturel/messages.html @@ -65,9 +65,9 @@ {% if filter.is_contact_messages %} - {% include "agenda_culturel/side-nav.html" with current="messages" %} + {% include "agenda_culturel/side-nav.html" with current="contact_messages" %} {% else %} -{% include "agenda_culturel/side-nav.html" with current="contact_messages" %} + {% include "agenda_culturel/side-nav.html" with current="messages" %} {% endif %}