diff options
| author | Daniel Schadt <kingdread@gmx.de> | 2026-11-14 11:20:24 +0100 |
|---|---|---|
| committer | Daniel Schadt <kingdread@gmx.de> | 2026-11-14 11:20:24 +0100 |
| commit | ed631749868b19604e30e972542ff6ba06d10a11 (patch) | |
| tree | a19f2aeb7710ad3f5b88696a863396d0a81803ab | |
| parent | dd4178fac9675e34574c4eba6539d59bba098372 (diff) | |
| download | fietsboek-ed631749868b19604e30e972542ff6ba06d10a11.tar.gz fietsboek-ed631749868b19604e30e972542ff6ba06d10a11.tar.bz2 fietsboek-ed631749868b19604e30e972542ff6ba06d10a11.zip | |
correct number of climbs
I'm not too happy about loading all climbs into memory, but for now this
works. In the future, replace with a COUNT(*) query probably.
| -rw-r--r-- | fietsboek/templates/climb_browse.jinja2 | 2 | ||||
| -rw-r--r-- | fietsboek/views/climb.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/fietsboek/templates/climb_browse.jinja2 b/fietsboek/templates/climb_browse.jinja2 index ce54ed1..0201d22 100644 --- a/fietsboek/templates/climb_browse.jinja2 +++ b/fietsboek/templates/climb_browse.jinja2 @@ -119,7 +119,7 @@ </div> {% if climbs %} <p clas="mb-3"> - {{ ngettext("page.climb_browse.num_climb", "page.climb_browse.num_climbs", climbs|length) }} + {{ ngettext("page.climb_browse.num_climb", "page.climb_browse.num_climbs", total_count) }} </p> <div class="climb-browse-list mb-3"> {% for climb in climbs %} diff --git a/fietsboek/views/climb.py b/fietsboek/views/climb.py index bd92f67..5d9fcf6 100644 --- a/fietsboek/views/climb.py +++ b/fietsboek/views/climb.py @@ -1,7 +1,6 @@ """Climb related endpoints.""" import gzip -import itertools import logging from enum import Enum @@ -138,8 +137,11 @@ def climb_browse(request: Request): start = (page - 1) * CLIMBS_PER_PAGE stop = start + CLIMBS_PER_PAGE + 1 - climbs = list(itertools.islice(request.dbsession.execute(climbs_qry).scalars(), start, stop)) + climbs = list(request.dbsession.execute(climbs_qry).scalars()) + total_count = len(climbs) + climbs = climbs[start:stop] return { + "total_count": total_count, "climbs": climbs[:CLIMBS_PER_PAGE], "page_previous": None if page <= 1 else util.qs_replace(request.url, page=str(page - 1)), "page_next": ( |
