From a213bc058dee221df6a5baf740b5e9156b285305 Mon Sep 17 00:00:00 2001 From: Sli Date: Sat, 28 Mar 2026 23:13:42 +0100 Subject: [PATCH] Add request argument to `paginate_jinja` and `paginate_htmx` --- core/templates/core/file_moderation.jinja | 4 +- core/templates/core/macros.jinja | 38 +++++++------------ .../templates/counter/cash_summary_list.jinja | 5 +-- .../templates/counter/refilling_list.jinja | 4 +- .../templates/election/election_list.jinja | 4 +- forum/templates/forum/topic.jinja | 6 +-- rootplace/templates/rootplace/logs.jinja | 4 +- 7 files changed, 27 insertions(+), 38 deletions(-) diff --git a/core/templates/core/file_moderation.jinja b/core/templates/core/file_moderation.jinja index f24ce731..ba9d03d4 100644 --- a/core/templates/core/file_moderation.jinja +++ b/core/templates/core/file_moderation.jinja @@ -10,7 +10,7 @@ {% extends "core/base.jinja" %} {% endif %} -{% from "core/macros.jinja" import paginate_htmx with context %} +{% from "core/macros.jinja" import paginate_htmx %} {% block title %} {% trans %}File moderation{% endtrans %} @@ -48,6 +48,6 @@ >{% trans %}Delete{% endtrans %}

{% endfor %} - {{ paginate_htmx(page_obj, paginator) }} + {{ paginate_htmx(request, page_obj, paginator) }} {% endblock %} diff --git a/core/templates/core/macros.jinja b/core/templates/core/macros.jinja index a8034f29..b39ae6d3 100644 --- a/core/templates/core/macros.jinja +++ b/core/templates/core/macros.jinja @@ -118,26 +118,21 @@ {% endmacro %} -{% macro paginate_jinja(current_page, paginator) %} +{% macro paginate_jinja(request, 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. - Warnings: - This macro must be imported with context : - ```jinja - {% from "core/macros.jinja" import paginate_jinja with context %} - ``` - Parameters: + request (django.http.request.HttpRequest): the current django request current_page (django.core.paginator.Page): the current page object paginator (django.core.paginator.Paginator): the paginator object #} - {{ paginate_server_side(current_page, paginator, False) }} + {{ paginate_server_side(request, current_page, paginator, False) }} {% endmacro %} -{% macro paginate_htmx(current_page, paginator) %} +{% macro paginate_htmx(request, current_page, paginator) %} {# Add pagination buttons for pages without Alpine but supporting fragments. This must be coupled with a view that handles pagination @@ -145,31 +140,26 @@ The replaced fragment will be #content so make sure you are calling this macro inside your content block. - Warnings: - This macro must be imported with context : - ```jinja - {% from "core/macros.jinja" import paginate_jinja with context %} - ``` - Parameters: + request (django.http.request.HttpRequest): the current django request current_page (django.core.paginator.Page): the current page object paginator (django.core.paginator.Paginator): the paginator object #} - {{ paginate_server_side(current_page, paginator, True) }} + {{ paginate_server_side(request, current_page, paginator, True) }} {% endmacro %} -{% macro paginate_server_side(current_page, paginator, use_htmx) %} +{% macro paginate_server_side(request, current_page, paginator, use_htmx) %}