darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-11 09:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed pagination logic to prevent infinite next button

Browse Source
This commit is contained in:
Beverly Nguyen
2025-07-29 10:25:43 -07:00
parent d65be41da5
commit e5885f674b
3 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/views/activity.py
View File

@@ -97,10 +97,12 @@ def handle_pagination(jobs, service_id, page):
else None
)
total_items = jobs.get("total", 0)
page_size = jobs.get("page_size", 50)
total_pages = (total_items + page_size - 1) // page_size
has_next_link = jobs.get("links", {}).get("next") is not None
next_page = (
generate_next_dict("main.all_jobs_activity", service_id, page)
if has_next_link and total_items > 50
if has_next_link and total_items > 50 and page < total_pages
else None
)
pagination = generate_pagination_pages(

3
app/main/views/jobs.py
View File

@@ -254,10 +254,13 @@ def get_notifications(service_id, message_type, status_override=None): # noqa
next_page = None
total_items = notifications.get("total", 0)
page_size = notifications.get("page_size", 50)
total_pages = (total_items + page_size - 1) // page_size
if (
"links" in notifications
and notifications["links"].get("next", None)
and total_items > 50
and page < total_pages
):
next_page = generate_next_dict(
"main.view_notifications", service_id, page, url_args