From ed631749868b19604e30e972542ff6ba06d10a11 Mon Sep 17 00:00:00 2001 From: Daniel Schadt Date: Sat, 14 Nov 2026 11:20:24 +0100 Subject: 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. --- fietsboek/templates/climb_browse.jinja2 | 2 +- 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 @@ {% if climbs %}

- {{ 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) }}

{% 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": ( -- cgit v1.2.3