LibreGaming
/
contentdb
14
0
Fork 0
Code Issues 13 Pull Requests Projects Releases Wiki Activity

Fix pagination losing query arguments 

Fixes #205
This commit is contained in:
rubenwardy 2020-07-10 22:08:52 +01:00
parent ba3b108239
commit 660b813ff7
3 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/blueprints/packages/packages.py
View File

@ -65,11 +65,6 @@ def list_all():
search = request.args.get("q")
type_name = request.args.get("type")
next_url = url_for("packages.list_all", type=type_name, q=search, page=query.next_num) \
if query.has_next else None
prev_url = url_for("packages.list_all", type=type_name, q=search, page=query.prev_num) \
if query.has_prev else None
authors = []
if search:
authors = User.query \
@ -83,12 +78,17 @@ def list_all():
qb.show_discarded = True
topics = qb.buildTopicQuery().all()
def url_builder(page):
args = dict(request.args)
args["page"] = page
return url_for("packages.list_all", **args)
tags = Tag.query.all()
return render_template("packages/list.html", \
title=title, packages=query.items, topics=topics, \
query=search, tags=tags, type=type_name, \
authors = authors, \
next_url=next_url, prev_url=prev_url, page=page, page_max=query.pages, packages_count=query.total)
authors=authors, packages_count=query.total, \
pagination=query, url_builder=url_builder)
def getReleases(package):

29
app/templates/macros/pagination.html Normal file
View File

@ -0,0 +1,29 @@
{% macro render_pagination(pagination, url_builder) %}
<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 %}
<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 page in pagination.iter_pages() %}
{% if page %}
<li class="page-item {% if page == pagination.page %}active{% endif %}">
<a class="page-link"
href="{{ url_builder(page) }}">
{{ page }}
</a>
</li>
{% else %}
<li class="page-item disabled">
&ellipsis;
</li>
{% endif %}
{%- endfor %}
<li class="page-item {% if not next_url %}disabled{% endif %}">
<a class="page-link" {% if next_url %}href="{{ next_url }}"{% endif %}>&raquo;</a>
</li>
</div>
{% endmacro %}

20
app/templates/packages/list.html
View File

@ -23,22 +23,10 @@
{% from "macros/packagegridtile.html" import render_pkggrid %}
{{ render_pkggrid(packages) }}
<ul class="pagination mt-4">
<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 %}">
<a class="page-link"
href="{{ url_for('packages.list_all', type=type, q=query, page=n) }}">
{{ n }}
</a>
</li>
{% endfor %}
<li class="page-item {% if not next_url %}disabled{% endif %}">
<a class="page-link" {% if next_url %}href="{{ next_url }}"{% endif %}>&raquo;</a>
</li>
</ul>
{% from "macros/pagination.html" import render_pagination %}
{{ render_pagination(pagination, url_builder) }}
{% if topics %}
<h2 style="margin-top:2em;">More content from the forums</h2>