From fca6a58c5ea6c4903ec5c010ffcc231d471e85a1 Mon Sep 17 00:00:00 2001
From: imperosol <thgirod@hotmail.com>
Date: Sun, 30 Nov 2025 16:55:44 +0100
Subject: [PATCH] feat: querystring jinja macro

---
 core/templates/core/macros.jinja | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/core/templates/core/macros.jinja b/core/templates/core/macros.jinja
index 78eb756b..d78725b7 100644
--- a/core/templates/core/macros.jinja
+++ b/core/templates/core/macros.jinja
@@ -157,12 +157,12 @@
     {% if current_page.has_previous() %}
       <a
         {% if use_htmx -%}
-          hx-get="?page={{ current_page.previous_page_number() }}"
+          hx-get="?{{ querystring(page=current_page.previous_page_number()) }}"
           hx-swap="innerHTML"
           hx-target="#content"
           hx-push-url="true"
         {%- else -%}
-          href="?page={{ current_page.previous_page_number() }}"
+          href="?{{ querystring(page=current_page.previous_page_number()) }}"
         {%- endif -%}
       >
         <button>
@@ -180,12 +180,12 @@
       {% else %}
         <a
           {% if use_htmx -%}
-            hx-get="?page={{ i }}"
+            hx-get="?{{ querystring(page=i) }}"
             hx-swap="innerHTML"
             hx-target="#content"
             hx-push-url="true"
           {%- else -%}
-            href="?page={{ i }}"
+            href="?{{ querystring(page=i) }}"
           {%- endif -%}
         >
           <button>{{ i }}</button>
@@ -195,12 +195,12 @@
     {% if current_page.has_next() %}
       <a
         {% if use_htmx -%}
-          hx-get="?page={{ current_page.next_page_number() }}"
+          hx-get="?querystring(page=current_page.next_page_number())"
           hx-swap="innerHTML"
           hx-target="#content"
           hx-push-url="true"
         {%- else -%}
-          href="?page={{ current_page.next_page_number() }}"
+          href="?querystring(page=current_page.next_page_number())"
         {%- endif -%}
       ><button>
         <i class="fa fa-caret-right"></i>
@@ -249,3 +249,17 @@
                  }"></div>
   {% endif %}
 {% endmacro %}
+
+
+{% macro querystring() %}
+  {%- for key, values in request.GET.lists() -%}
+    {%- if key not in kwargs -%}
+      {%- for value in values -%}
+        {{ key }}={{ value }}&amp;
+      {%- endfor -%}
+    {%- endif -%}
+  {%- endfor -%}
+  {%- for key, value in kwargs.items() -%}
+    {{ key }}={{ value }}&amp;
+  {%- endfor -%}
+{% endmacro %}
\ No newline at end of file