a3x/nyaa
1
0
Fork 0
mirror of https://gitlab.com/SIGBUS/nyaa.git synced 2025-01-02 15:25:40 +00:00
Code Issues Projects Releases Wiki Activity

extensions: limit pagination to max num of pages

Browse source
This commit is contained in:
Nicolas F 2019-04-02 18:57:56 +02:00
parent 6608c99b90
commit db83989d5d
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nyaa/extensions.py
View file

@ -27,6 +27,8 @@ def fix_paginate():
total_query_count = count_query.scalar() total_query_count = count_query.scalar()
else: else:
total_query_count = self.count() total_query_count = self.count()
if max_page:
total_query_count = min(total_query_count, max_page * per_page)
# Grab items on current page # Grab items on current page
items = self.limit(per_page).offset((page - 1) * per_page).all() items = self.limit(per_page).offset((page - 1) * per_page).all()

1
nyaa/search.py
View file

@ -511,7 +511,6 @@ def search_db(term='', user=None, sort='id', order='desc', category='0_0',
if len(item) >= 2: if len(item) >= 2:
qpc.filter(FullTextSearch( qpc.filter(FullTextSearch(
item, models.TorrentNameSearch, FullTextMode.NATURAL)) item, models.TorrentNameSearch, FullTextMode.NATURAL))
query, count_query = qpc.items query, count_query = qpc.items
# Sort and order # Sort and order
if sort_column.class_ != models.Torrent: if sort_column.class_ != models.Torrent: