From a2243e5e9a8bf9f55fe53c997937f94778b940d4 Mon Sep 17 00:00:00 2001
From: Sli <antoine@bartuccio.fr>
Date: Wed, 17 Dec 2025 00:05:18 +0100
Subject: [PATCH] Fix pagination on matmat, don't allow empty matmat search and
 add htmx pagination

---
 core/templates/core/macros.jinja          |  6 ++++--
 locale/fr/LC_MESSAGES/django.po           |  6 +++++-
 matmat/forms.py                           |  8 +++++++-
 matmat/templates/matmat/search_form.jinja | 13 ++++++++----
 matmat/tests.py                           | 24 +++++++++++++++++++++++
 matmat/views.py                           |  5 +++--
 6 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/core/templates/core/macros.jinja b/core/templates/core/macros.jinja
index d78725b7..e2f19314 100644
--- a/core/templates/core/macros.jinja
+++ b/core/templates/core/macros.jinja
@@ -161,6 +161,7 @@
           hx-swap="innerHTML"
           hx-target="#content"
           hx-push-url="true"
+          hx-trigger="click, keyup[key=='ArrowLeft'] from:body"
         {%- else -%}
           href="?{{ querystring(page=current_page.previous_page_number()) }}"
         {%- endif -%}
@@ -195,12 +196,13 @@
     {% if current_page.has_next() %}
       <a
         {% if use_htmx -%}
-          hx-get="?querystring(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"
+          hx-trigger="click, keyup[key=='ArrowRight'] from:body"
         {%- else -%}
-          href="?querystring(page=current_page.next_page_number())"
+          href="?{{querystring(page=current_page.next_page_number())}}"
         {%- endif -%}
       ><button>
         <i class="fa fa-caret-right"></i>
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 62866676..97a2228a 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-11-30 18:23+0100\n"
+"POT-Creation-Date: 2025-12-17 00:03+0100\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -4388,6 +4388,10 @@ msgstr "Ce citoyen n'a pas encore rejoint la galaxie"
 msgid "Last/First name or nickname"
 msgstr "Nom de famille, prénom ou surnom"
 
+#: matmat/forms.py
+msgid "Empty search"
+msgstr "Recherche vide"
+
 #: matmat/templates/matmat/search_form.jinja
 msgid "Search user"
 msgstr "Rechercher un utilisateur"
diff --git a/matmat/forms.py b/matmat/forms.py
index 6ce3df38..35fc21f2 100644
--- a/matmat/forms.py
+++ b/matmat/forms.py
@@ -16,13 +16,14 @@
 # details.
 #
 # You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 #
 from typing import Any
 
 from django import forms
+from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
 from core.models import User
@@ -46,3 +47,8 @@ class SearchForm(forms.ModelForm):
             self.fields[key].required = False
             if key not in initial:
                 self.fields[key].initial = None
+
+    def clean(self):
+        data = self.cleaned_data
+        if all(data[key] in self.fields[key].empty_values for key in self.fields):
+            raise ValidationError(_("Empty search"))
diff --git a/matmat/templates/matmat/search_form.jinja b/matmat/templates/matmat/search_form.jinja
index 8964749f..a70d644a 100644
--- a/matmat/templates/matmat/search_form.jinja
+++ b/matmat/templates/matmat/search_form.jinja
@@ -1,6 +1,11 @@
-{% extends "core/base.jinja" %}
-{% from "core/macros.jinja" import user_mini_profile, paginate_jinja %}
-{% from "core/macros.jinja" import user_mini_profile, paginate_jinja with context %}
+{% if is_fragment %}
+  {% extends "core/base_fragment.jinja" %}
+{% else %}
+  {% extends "core/base.jinja" %}
+{% endif %}
+
+{% from "core/macros.jinja" import user_mini_profile, paginate_htmx with context %}
+
 
 {% block title %}
   {% trans %}Search user{% endtrans %}
@@ -20,7 +25,7 @@
       {% endfor %}
     </div>
     {% if page_obj.has_other_pages() %}
-      {{ paginate_jinja(page_obj, paginator) }}
+      {{ paginate_htmx(page_obj, paginator) }}
     {% endif %}
     <hr>
   {% endif %}
diff --git a/matmat/tests.py b/matmat/tests.py
index 3640ddda..712839c6 100644
--- a/matmat/tests.py
+++ b/matmat/tests.py
@@ -33,3 +33,27 @@ class TestMatmatronch(TestCase):
         )
         assert response.status_code == 200
         assert list(response.context_data["object_list"]) == [self.users[2]]
+
+    def test_empty_search(self):
+        self.client.force_login(subscriber_user.make())
+        response = self.client.get(reverse("matmat:search"))
+        assert response.status_code == 200
+        assert list(response.context_data["object_list"]) == []
+        assert not response.context_data["form"].is_valid()
+
+        response = self.client.get(
+            reverse(
+                "matmat:search",
+                query={
+                    "promo": "",
+                    "role": "",
+                    "department": "",
+                    "semester": "",
+                    "date_of_birth": "",
+                },
+            )
+        )
+        assert response.status_code == 200
+        assert list(response.context_data["object_list"]) == []
+        assert not response.context_data["form"].is_valid()
+        assert "Empty search" in response.context_data["form"].non_field_errors()
diff --git a/matmat/views.py b/matmat/views.py
index dda3cae0..711d7e17 100644
--- a/matmat/views.py
+++ b/matmat/views.py
@@ -16,7 +16,7 @@
 # details.
 #
 # You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 #
@@ -28,10 +28,11 @@ from django.views.generic.edit import FormMixin
 from core.auth.mixins import FormerSubscriberMixin
 from core.models import User, UserQuerySet
 from core.schemas import UserFilterSchema
+from core.views.mixins import AllowFragment
 from matmat.forms import SearchForm
 
 
-class MatmatronchView(FormerSubscriberMixin, FormMixin, ListView):
+class MatmatronchView(AllowFragment, FormerSubscriberMixin, FormMixin, ListView):
     model = User
     paginate_by = 20
     template_name = "matmat/search_form.jinja"