Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2025-03-24 02:52:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix params in topic list being lost on page change

Browse Source
This commit is contained in:
rubenwardy
2018-12-25 18:10:31 +00:00
parent f5744f5188
commit b10660030a
2 changed files with 12 additions and 7 deletions
app
templates/todo
topics.html
views/packages
todo.py

13
app/templates/todo/topics.html

@ -54,7 +54,10 @@ Topics to be Added
</div> </div>
<form method="GET" action="{{ url_for('todo_topics_page') }}" class="my-4"> <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" /> <input class="btn btn-secondary my-2 my-sm-0 mr-sm-2" type="submit" value="Search" />
</form> </form>
@ -65,11 +68,11 @@ Topics to be Added
<li class="page-item {% if not prev_url %}disabled{% endif %}"> <li class="page-item {% if not prev_url %}disabled{% endif %}">
<a class="page-link" {% if prev_url %}href="{{ prev_url }}"{% endif %}>&laquo;</a> <a class="page-link" {% if prev_url %}href="{{ prev_url }}"{% endif %}>&laquo;</a>
</li> </li>
{% for n in range(1, page_max+1) %} {% for i in range(1, page_max+1) %}
<li class="page-item {% if n == page %}active{% endif %}"> <li class="page-item {% if i == page %}active{% endif %}">
<a class="page-link" <a class="page-link"
href="{{ url_for('todo_topics_page', page=n) }}"> href="{{ url_for('todo_topics_page', page=i, query=query, show_discarded=show_discarded, n=n, sort=sort_by) }}">
{{ n }} {{ i }}
</a> </a>
</li> </li>
{% endfor %} {% endfor %}

6
app/views/packages/todo.py

@ -83,9 +83,11 @@ def todo_topics_page():
num = 100 num = 100
query = query.paginate(page, num, True) 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 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 if query.has_prev else None
return render_template("todo/topics.html", topics=query.items, total=total, \ return render_template("todo/topics.html", topics=query.items, total=total, \