Use urlencode for querystring macro

core/templates/core/file_moderation.jinja

@@ -10,7 +10,7 @@
   {% extends "core/base.jinja" %}
 {% endif %}
 
-{% from "core/macros.jinja" import paginate_htmx %}
+{% from "core/macros.jinja" import paginate_htmx with context %}
 
 {% block title %}
   {% trans %}File moderation{% endtrans %}

core/templates/core/macros.jinja

@@ -124,6 +124,9 @@
     This must be coupled with a view that handles pagination
     with the Django Paginator object.
 
+    Warning:
+      You must include this macro `with context` as it uses the `querystring` macro
+
     Parameters:
         current_page (django.core.paginator.Page): the current page object
         paginator (django.core.paginator.Paginator): the paginator object
@@ -139,6 +142,9 @@
 
     The replaced fragment will be #content so make sure you are calling this macro inside your content block.
 
+    Warning:
+      You must include this macro `with context` as it uses the `querystring` macro
+
     Parameters:
         current_page (django.core.paginator.Page): the current page object
         paginator (django.core.paginator.Paginator): the paginator object
@@ -248,14 +254,5 @@
 
 
 {% macro querystring() %}
-  {%- for key, values in request.GET.lists() -%}
+  {{- urlencode(dict(dict(request.GET.lists()) | items | list + kwargs | items | list), doseq=True) -}}
-    {%- if key not in kwargs -%}
-      {%- for value in values -%}
-        {{ key }}={{ value }}&
-      {%- endfor -%}
-    {%- endif -%}
-  {%- endfor -%}
-  {%- for key, value in kwargs.items() -%}
-    {{ key }}={{ value }}&
-  {%- endfor -%}
 {% endmacro %}

counter/templates/counter/cash_summary_list.jinja

@@ -1,5 +1,6 @@
 {% extends "core/base.jinja" %}
-{% from 'core/macros.jinja' import user_profile_link, paginate_jinja %}
+{% from 'core/macros.jinja' import user_profile_link %}
+{% from 'core/macros.jinja' import paginate_jinja with context %}
 
 {% block title %}
   {% trans %}Cash register summary list{% endtrans %}

counter/templates/counter/refilling_list.jinja

@@ -1,5 +1,5 @@
 {% extends "core/base.jinja" %}
-{% from "core/macros.jinja" import paginate_jinja %}
+{% from "core/macros.jinja" import paginate_jinja with context %}
 
 {% block title %}
   {%- trans %}Reloads list{% endtrans %} -- {{ counter.name }}

election/templates/election/election_list.jinja

@@ -1,5 +1,5 @@
 {% extends "core/base.jinja" %}
-{% from "core/macros.jinja" import paginate_jinja %}
+{% from "core/macros.jinja" import paginate_jinja with context %}
 
 {% block title %}
   {%- trans %}Election list{% endtrans %}

forum/templates/forum/topic.jinja

@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 {% from 'core/macros.jinja' import user_profile_link %}
 {% from 'forum/macros.jinja' import display_message, display_breadcrumb, display_search_bar %}
-{% from 'core/macros.jinja' import paginate_jinja %}
+{% from 'core/macros.jinja' import paginate_jinja with context %}
 
 {% block title %}
   {{ topic }}
@@ -44,7 +44,9 @@
 
     <p><a class="ib button" href="{{ url('forum:new_message', topic_id=topic.id) }}">{% trans %}Reply{% endtrans %}</a></p>
 
-    {{ paginate_jinja(msgs, msgs.paginator) }}
+    {% if is_paginated %}
+      {{ paginate_jinja(msgs, msgs.paginator) }}
+    {% endif %}
   </div>
 {% endblock %}
 

rootplace/templates/rootplace/logs.jinja

@@ -1,5 +1,5 @@
 {% extends "core/base.jinja" %}
-{% from "core/macros.jinja" import paginate_jinja %}
+{% from "core/macros.jinja" import paginate_jinja with context %}
 
 {% block title %}
   {% trans %}Operation logs{% endtrans %}
@@ -28,5 +28,7 @@
   </table>
 
   <br>
-  {{ paginate_jinja(page_obj, paginator) }}
+  {% if is_paginated %}
+    {{ paginate_jinja(page_obj, paginator) }}
+  {% endif %}
 {% endblock content %}

sith/settings.py

@@ -190,6 +190,7 @@ TEMPLATES = [
                 "get_sith": "com.views.sith",
                 "get_language": "django.utils.translation.get_language",
                 "timedelta": "datetime.timedelta",
+                "urlencode": "urllib.parse.urlencode",
             },
             "bytecode_cache": {
                 "name": "default",