From 1800785b80da648c2f2a5dc338d02151db25932f Mon Sep 17 00:00:00 2001
From: thomas girod <thgirod@hotmail.com>
Date: Wed, 25 Sep 2024 14:35:13 +0200
Subject: [PATCH] generalize usage of the paginate_jinja macro

---
 club/templates/club/club_sellings.jinja           |  1 +
 core/templates/core/base.jinja                    |  1 +
 core/templates/core/macros.jinja                  | 13 +++++++++++--
 counter/templates/counter/cash_summary_list.jinja |  4 ++--
 counter/templates/counter/refilling_list.jinja    |  4 ++--
 election/templates/election/election_list.jinja   |  4 ++--
 forum/templates/forum/topic.jinja                 |  1 -
 matmat/templates/matmat/search_form.jinja         |  6 ++++--
 pedagogy/templates/pedagogy/guide.jinja           |  1 -
 rootplace/templates/rootplace/logs.jinja          |  4 ++--
 sas/templates/sas/album.jinja                     |  1 -
 11 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/club/templates/club/club_sellings.jinja b/club/templates/club/club_sellings.jinja
index 191d5fb2..184abda7 100644
--- a/club/templates/club/club_sellings.jinja
+++ b/club/templates/club/club_sellings.jinja
@@ -53,6 +53,7 @@
       {% endfor %}
     </tbody>
   </table>
+    {# TODO: Replace this pagination by an Alpine pagination #}
   <script type="text/javascript">
     function formPagination(link){
       $("form").attr("action", link.href);
diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index f49aa302..ffdc81ab 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -11,6 +11,7 @@
       <link rel="stylesheet" href="{{ scss('core/markdown.scss') }}">
       <link rel="stylesheet" href="{{ scss('core/header.scss') }}">
       <link rel="stylesheet" href="{{ scss('core/navbar.scss') }}">
+      <link rel="stylesheet" href="{{ scss('core/pagination.scss') }}">
       <link rel="stylesheet" href="{{ static('vendored/select2/select2.min.css') }}">
 
       {% block jquery_css %}
diff --git a/core/templates/core/macros.jinja b/core/templates/core/macros.jinja
index fecf8247..283db145 100644
--- a/core/templates/core/macros.jinja
+++ b/core/templates/core/macros.jinja
@@ -157,6 +157,15 @@
 {% endmacro %}
 
 {% macro paginate_jinja(current_page, paginator) %}
+    {# Add pagination buttons for pages without Alpine.
+
+    This must be coupled with a view that handles pagination
+    with the Django Paginator object.
+
+    Parameters:
+        current_page (django.core.paginator.Page): the current page object
+        paginator (django.core.paginator.Paginator): the paginator object
+    #}
   <nav class="pagination">
     {% if current_page.has_previous() %}
       <a href="?page={{ current_page.previous_page_number() }}">
@@ -170,8 +179,8 @@
     {% for i in paginator.get_elided_page_range(current_page.number) %}
       {% if i == current_page.number %}
         <button class="active">{{ i }}</button>
-          {% elif i == paginator.ELLIPSIS %}
-          <strong>{{ paginator.ELLIPSIS }}</strong>
+      {% elif i == paginator.ELLIPSIS %}
+        <strong>{{ paginator.ELLIPSIS }}</strong>
       {% else %}
         <a href="?page={{ i }}">
           <button>{{ i }}</button>
diff --git a/counter/templates/counter/cash_summary_list.jinja b/counter/templates/counter/cash_summary_list.jinja
index c6817d41..443c2085 100644
--- a/counter/templates/counter/cash_summary_list.jinja
+++ b/counter/templates/counter/cash_summary_list.jinja
@@ -1,5 +1,5 @@
 {% extends "core/base.jinja" %}
-{% from 'core/macros.jinja' import user_profile_link, paginate %}
+{% from 'core/macros.jinja' import user_profile_link, paginate_jinja %}
 
 {% block title %}
   {% trans %}Cash register summary list{% endtrans %}
@@ -57,7 +57,7 @@
     </table>
     <br>
     {% if is_paginated %}
-      {{ paginate(page_obj, paginator) }}
+      {{ paginate_jinja(page_obj, paginator) }}
     {% endif %}
   {% else %}
     {% trans %}There is no cash register summary in this website.{% endtrans %}
diff --git a/counter/templates/counter/refilling_list.jinja b/counter/templates/counter/refilling_list.jinja
index ab7a100e..efdfcc23 100644
--- a/counter/templates/counter/refilling_list.jinja
+++ b/counter/templates/counter/refilling_list.jinja
@@ -1,5 +1,5 @@
 {% extends "core/base.jinja" %}
-{% from 'core/macros.jinja' import paginate %}
+{% from "core/macros.jinja" import paginate_jinja %}
 
 {% block title %}
   {%- trans %}Reloads list{% endtrans %} -- {{ counter.name }}
@@ -28,7 +28,7 @@
       {%- endfor %}
     </table>
     {% if is_paginated %}
-      {{ paginate(page_obj, paginator) }}
+      {{ paginate_jinja(page_obj, paginator) }}
     {% endif %}
 {%- endblock %}
 
diff --git a/election/templates/election/election_list.jinja b/election/templates/election/election_list.jinja
index 8eec56dd..1bbe6e07 100644
--- a/election/templates/election/election_list.jinja
+++ b/election/templates/election/election_list.jinja
@@ -1,5 +1,5 @@
 {% extends "core/base.jinja" %}
-{% from 'core/macros.jinja' import paginate %}
+{% from "core/macros.jinja" import paginate_jinja %}
 
 {% block title %}
   {%- trans %}Election list{% endtrans %}
@@ -46,7 +46,7 @@
     </section>
   {%- endfor %}
   {% if is_paginated %}
-    {{ paginate(page_obj, paginator) }}
+    {{ paginate_jinja(page_obj, paginator) }}
   {% endif %}
 {%- endblock %}
 
diff --git a/forum/templates/forum/topic.jinja b/forum/templates/forum/topic.jinja
index 41191f4b..06336a01 100644
--- a/forum/templates/forum/topic.jinja
+++ b/forum/templates/forum/topic.jinja
@@ -10,7 +10,6 @@
 
 {% block additional_css %}
   <link rel="stylesheet" href="{{ scss('forum/css/forum.scss') }}">
-  <link rel="stylesheet" href="{{ scss('core/pagination.scss') }}">
 {% endblock %}
 
 {% block content %}
diff --git a/matmat/templates/matmat/search_form.jinja b/matmat/templates/matmat/search_form.jinja
index fe607bb6..73656146 100644
--- a/matmat/templates/matmat/search_form.jinja
+++ b/matmat/templates/matmat/search_form.jinja
@@ -1,5 +1,5 @@
-{% from "core/macros.jinja" import user_mini_profile, paginate %}
 {% extends "core/base.jinja" %}
+{% from "core/macros.jinja" import user_mini_profile, paginate_jinja %}
 
 {% block title %}
   {% trans %}Search user{% endtrans %}
@@ -18,7 +18,9 @@
 
       {% endfor %}
     </div>
-    {{ paginate(page_obj, paginator) }}
+    {% if page_obj.has_other_pages() %}
+      {{ paginate_jinja(page_obj, paginator) }}
+    {% endif %}
     <hr>
   {% endif %}
   <h2>{% trans %}Search user{% endtrans %}</h2>
diff --git a/pedagogy/templates/pedagogy/guide.jinja b/pedagogy/templates/pedagogy/guide.jinja
index fcf9599a..29fdc011 100644
--- a/pedagogy/templates/pedagogy/guide.jinja
+++ b/pedagogy/templates/pedagogy/guide.jinja
@@ -7,7 +7,6 @@
 
 {% block additional_css %}
   <link rel="stylesheet" href="{{ scss('pedagogy/css/pedagogy.scss') }}">
-  <link rel="stylesheet" href="{{ scss('core/pagination.scss') }}">
 {% endblock %}
 
 {% block head %}
diff --git a/rootplace/templates/rootplace/logs.jinja b/rootplace/templates/rootplace/logs.jinja
index 10155cf1..134584e8 100644
--- a/rootplace/templates/rootplace/logs.jinja
+++ b/rootplace/templates/rootplace/logs.jinja
@@ -1,5 +1,5 @@
 {% extends "core/base.jinja" %}
-{% from 'core/macros.jinja' import paginate %}
+{% from "core/macros.jinja" import paginate_jinja %}
 
 {% block title %}
   {% trans %}Operation logs{% endtrans %}
@@ -28,5 +28,5 @@
   </table>
 
   <br>
-  {{ paginate(page_obj, paginator) }}
+  {{ paginate_jinja(page_obj, paginator) }}
 {% endblock content %}
\ No newline at end of file
diff --git a/sas/templates/sas/album.jinja b/sas/templates/sas/album.jinja
index 3847bf47..1afa43b4 100644
--- a/sas/templates/sas/album.jinja
+++ b/sas/templates/sas/album.jinja
@@ -3,7 +3,6 @@
 
 {%- block additional_css -%}
   <link rel="stylesheet" href="{{ scss('sas/css/album.scss') }}">
-  <link rel="stylesheet" href="{{ scss('core/pagination.scss') }}">
 {%- endblock -%}
 
 {% block title %}