From f437850a501cfee91dc70ad6d88d2ed215f8b2c6 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sun, 12 Jul 2020 17:15:30 +0100
Subject: Add global url_set_query Jinja template function

---
 app/templates/macros/pagination.html | 8 ++++----
 app/templates/packages/list.html     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/templates')

diff --git a/app/templates/macros/pagination.html b/app/templates/macros/pagination.html
index 2ea0eb2..5e1cbdd 100644
--- a/app/templates/macros/pagination.html
+++ b/app/templates/macros/pagination.html
@@ -1,7 +1,7 @@
-{% macro render_pagination(pagination, url_builder) %}
+{% macro render_pagination(pagination, url_set_query) %}
 	<ul class="pagination mt-4">
-		{% set prev_url = url_builder(pagination.prev_num) if pagination.has_prev %}
-		{% set next_url = url_builder(pagination.next_num) if pagination.has_next %}
+		{% set prev_url = url_set_query(page=pagination.prev_num) if pagination.has_prev %}
+		{% set next_url = url_set_query(page=pagination.next_num) if pagination.has_next %}
 
 		<li class="page-item {% if not prev_url %}disabled{% endif %}">
 			<a class="page-link" {% if prev_url %}href="{{ prev_url }}"{% endif %}>&laquo;</a>
@@ -11,7 +11,7 @@
 			{% if page %}
 				<li class="page-item {% if page == pagination.page %}active{% endif %}">
 					<a class="page-link"
-							href="{{ url_builder(page) }}">
+							href="{{ url_set_query(page=page) }}">
 						{{ page }}
 					</a>
 				</li>
diff --git a/app/templates/packages/list.html b/app/templates/packages/list.html
index 8f3a595..da0d80c 100644
--- a/app/templates/packages/list.html
+++ b/app/templates/packages/list.html
@@ -25,7 +25,7 @@
 
 
 	{% from "macros/pagination.html" import render_pagination %}
-	{{ render_pagination(pagination, url_builder) }}
+	{{ render_pagination(pagination, url_set_query) }}
 
 
 	{% if topics %}
-- 
cgit v1.2.3