aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fietsboek/views/browse.py6
-rw-r--r--fietsboek/views/climb.py20
2 files changed, 21 insertions, 5 deletions
diff --git a/fietsboek/views/browse.py b/fietsboek/views/browse.py
index 15480d6..1753104 100644
--- a/fietsboek/views/browse.py
+++ b/fietsboek/views/browse.py
@@ -526,7 +526,11 @@ def browse(request: Request) -> Response:
"mps_to_kph": util.mps_to_kph,
"used_filters": bool(filters),
"page_previous": None if page == 1 else util.qs_replace(request.url, page=str(page - 1)),
- "page_next": None if len(tracks) <= TRACKS_PER_PAGE else util.qs_replace(request.url, page=str(page + 1)),
+ "page_next": (
+ None
+ if len(tracks) <= TRACKS_PER_PAGE
+ else util.qs_replace(request.url, page=str(page + 1))
+ ),
}
diff --git a/fietsboek/views/climb.py b/fietsboek/views/climb.py
index 03f3484..e0328a9 100644
--- a/fietsboek/views/climb.py
+++ b/fietsboek/views/climb.py
@@ -95,7 +95,9 @@ def _apply_filters(query: Select, request: Request) -> Select:
except ValueError:
raise HTTPBadRequest(f"invalid category")
if -1 in categories:
- query = query.where(or_(models.Climb.category.in_(categories), models.Climb.category.is_(None)))
+ query = query.where(
+ or_(models.Climb.category.in_(categories), models.Climb.category.is_(None))
+ )
else:
query = query.where(models.Climb.category.in_(categories))
@@ -108,8 +110,14 @@ def _apply_filters(query: Select, request: Request) -> Select:
request_method="GET",
)
def climb_browse(request: Request):
- tracks_qry = aliased(models.Track, models.User.visible_tracks_query(request.identity).subquery())
- climbs_qry = select(models.Climb).filter(models.Climb.track_id.in_(select(tracks_qry.id))).join(models.Climb.track)
+ tracks_qry = aliased(
+ models.Track, models.User.visible_tracks_query(request.identity).subquery()
+ )
+ climbs_qry = (
+ select(models.Climb)
+ .filter(models.Climb.track_id.in_(select(tracks_qry.id)))
+ .join(models.Climb.track)
+ )
order = ResultOrder.DATE_DESC
if request.params.get("sort"):
@@ -128,7 +136,11 @@ def climb_browse(request: Request):
return {
"climbs": climbs[:CLIMBS_PER_PAGE],
"page_previous": None if page <= 1 else util.qs_replace(request.url, page=str(page - 1)),
- "page_next": None if len(climbs) <= CLIMBS_PER_PAGE else util.qs_replace(request.url, page=str(page + 1)),
+ "page_next": (
+ None
+ if len(climbs) <= CLIMBS_PER_PAGE
+ else util.qs_replace(request.url, page=str(page + 1))
+ ),
}