Add pagination

This commit is contained in:
rubenwardy 2018-05-29 16:52:53 +01:00
parent f1b21b73b2
commit 89f95a22dc
No known key found for this signature in database
GPG Key ID: A1E29D52FF81513C
2 changed files with 19 additions and 3 deletions

@ -11,7 +11,7 @@
<input type="submit" value="Search" />
<p>
Found {{ packages | count }} packages.
Found {{ packages_count }} packages.
</p>
</form>
@ -31,4 +31,10 @@
{% from "macros/packagegridtile.html" import render_pkggrid %}
{{ render_pkggrid(packages) }}
<ul class="buttonset linedbuttonset">
{% if prev_url %}<li><a href="{{ prev_url }}">Previous</a></li>{% endif %}
<li>{{ page }} / {{ page_max }}</li>
{% if next_url %}<li><a href="{{ next_url }}">Next</a></li> {% endif %}
</ul>
{% endblock %}

@ -58,9 +58,19 @@ def packages_page():
for package in query.all() if package.getDownloadRelease() is not None]
return jsonify(pkgs)
else:
page = int(request.args.get("page") or 1)
num = min(42, int(request.args.get("n") or 100))
query = query.paginate(page, num, True)
next_url = url_for("packages_page", type=type.toName(), q=search, page=query.next_num) \
if query.has_next else None
prev_url = url_for("packages_page", type=type.toName(), q=search, page=query.prev_num) \
if query.has_prev else None
tags = Tag.query.all()
return render_template("packages/list.html", title=title, packages=query.all(), \
query=search, tags=tags, type=None if type is None else type.toName())
return render_template("packages/list.html", title=title, packages=query.items, \
query=search, tags=tags, type=None if type is None else type.toName(), \
next_url=next_url, prev_url=prev_url, page=page, page_max=query.pages, packages_count=query.total)
def getReleases(package):