From b10660030abf04e87c2e64f13c7b10f608e297d0 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Tue, 25 Dec 2018 18:10:31 +0000
Subject: [PATCH] Fix params in topic list being lost on page change

---
 app/templates/todo/topics.html | 13 ++++++++-----
 app/views/packages/todo.py     |  6 ++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/templates/todo/topics.html b/app/templates/todo/topics.html
index b112254..7fa6644 100644
--- a/app/templates/todo/topics.html
+++ b/app/templates/todo/topics.html
@@ -54,7 +54,10 @@ Topics to be Added
 	</div>
 
 	<form method="GET" action="{{ url_for('todo_topics_page') }}" class="my-4">
-		<input class="" name="q" type="text" placeholder="Search topics" value="{{ query or ''}}">
+		<input type="hidden" name="show_discarded" value={{ show_discarded and "True" or "False" }} />
+		<input type="hidden" name="n" value={{ n }} />
+		<input type="hidden" name="sort" value={{ sort_by or "date" }} />
+		<input name="q" type="text" placeholder="Search topics" value="{{ query or ''}}">
 		<input class="btn btn-secondary my-2 my-sm-0 mr-sm-2" type="submit" value="Search" />
 	</form>
 
@@ -65,11 +68,11 @@ Topics to be Added
 		<li class="page-item {% if not prev_url %}disabled{% endif %}">
 			<a class="page-link" {% if prev_url %}href="{{ prev_url }}"{% endif %}>&laquo;</a>
 		</li>
-		{% for n in range(1, page_max+1) %}
-			<li class="page-item {% if n == page %}active{% endif %}">
+		{% for i in range(1, page_max+1) %}
+			<li class="page-item {% if i == page %}active{% endif %}">
 				<a class="page-link"
-						href="{{ url_for('todo_topics_page', page=n) }}">
-					{{ n }}
+						href="{{ url_for('todo_topics_page', page=i, query=query, show_discarded=show_discarded, n=n, sort=sort_by) }}">
+					{{ i }}
 				</a>
 			</li>
 		{% endfor %}
diff --git a/app/views/packages/todo.py b/app/views/packages/todo.py
index 803ae44..854e165 100644
--- a/app/views/packages/todo.py
+++ b/app/views/packages/todo.py
@@ -83,9 +83,11 @@ def todo_topics_page():
 		num = 100
 
 	query = query.paginate(page, num, True)
-	next_url = url_for("todo_topics_page", page=query.next_num) \
+	next_url = url_for("todo_topics_page", page=query.next_num, query=search, \
+	 	show_discarded=show_discarded, n=num, sort=sort_by) \
 			if query.has_next else None
-	prev_url = url_for("todo_topics_page", page=query.prev_num) \
+	prev_url = url_for("todo_topics_page", page=query.prev_num, query=search, \
+	 	show_discarded=show_discarded, n=num, sort=sort_by) \
 			if query.has_prev else None
 
 	return render_template("todo/topics.html", topics=query.items, total=total, \