From 483036bc33ced00fcca1144c3db5e7172e888ef2 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Sat, 25 Jan 2025 18:25:39 +0100
Subject: [PATCH] On corrige la navigation dans les fixed

---
 src/agenda_culturel/filters.py                | 21 +++++++++++++++++++
 .../templates/agenda_culturel/duplicates.html |  8 +++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/agenda_culturel/filters.py b/src/agenda_culturel/filters.py
index cb90b9e..8d683b5 100644
--- a/src/agenda_culturel/filters.py
+++ b/src/agenda_culturel/filters.py
@@ -503,7 +503,28 @@ class DuplicatedEventsFilter(django_filters.FilterSet):
         model = DuplicatedEvents
         fields = []
 
+    def get_cleaned_data(self, name):
+        try:
+            return self.form.cleaned_data[name]
+        except AttributeError:
+            return {}
+        except KeyError:
+            return {}
+
+    def get_fixed_url(self):
+        if "fixed" in self.form.cleaned_data:
+            if self.form.cleaned_data["fixed"] is None:
+                return "fixed=unknown"
+            else:
+                if self.form.cleaned_data["fixed"]:
+                    return "fixed=true"
+                else:
+                    return "fixed=false" 
+        else:
+            return ""
+        
     
+
     def fixed_qs(self, queryset, name, value):
         return DuplicatedEvents.not_fixed_qs(queryset, value)
 
diff --git a/src/agenda_culturel/templates/agenda_culturel/duplicates.html b/src/agenda_culturel/templates/agenda_culturel/duplicates.html
index bc211d4..6689e9a 100644
--- a/src/agenda_culturel/templates/agenda_culturel/duplicates.html
+++ b/src/agenda_culturel/templates/agenda_culturel/duplicates.html
@@ -41,8 +41,8 @@
 <footer>
     <span>
         {% if paginator_filter.has_previous %}
-            <a href="?page=1" role="button">&laquo; premier</a>
-            <a href="?page={{ paginator_filter.previous_page_number }}" role="button">&lt; précédent</a>
+            <a href="?page=1&{{ filter.get_fixed_url }}" role="button">&laquo; premier</a>
+            <a href="?page={{ paginator_filter.previous_page_number }}&{{ filter.get_fixed_url }}" role="button">&lt; précédent</a>
         {% endif %}
 
         <span>
@@ -50,8 +50,8 @@
         </span>
 
         {% if paginator_filter.has_next %}
-            <a href="?page={{ paginator_filter.next_page_number }}" role="button">suivant &gt;</a>
-            <a href="?page={{ paginator_filter.paginator.num_pages }}" role="button">dernier &raquo;</a>
+            <a href="?page={{ paginator_filter.next_page_number }}&{{ filter.get_fixed_url }}" role="button">suivant &gt;</a>
+            <a href="?page={{ paginator_filter.paginator.num_pages }}&{{ filter.get_fixed_url }}" role="button">dernier &raquo;</a>
         {% endif %}
     </span>
 </footer>