From 670da9fa03e976db17da0745df23d38d30c63693 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna <46787868+vamsikrishnamathala@users.noreply.github.com> Date: Tue, 1 Jul 2025 13:21:29 +0530 Subject: [PATCH 1/2] [WEB-4416]fix: Unnecessary border on Intake header #7297 --- web/ce/components/projects/settings/intake/header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ce/components/projects/settings/intake/header.tsx b/web/ce/components/projects/settings/intake/header.tsx index 9b0c994b5..0aa77e470 100644 --- a/web/ce/components/projects/settings/intake/header.tsx +++ b/web/ce/components/projects/settings/intake/header.tsx @@ -36,7 +36,7 @@ export const ProjectInboxHeader: FC = observer(() => { return (
-
+
Date: Tue, 1 Jul 2025 15:03:20 +0530 Subject: [PATCH 2/2] [WEB-4418]fix: fixed the pagination for issues #7301 --- apiserver/plane/utils/paginator.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apiserver/plane/utils/paginator.py b/apiserver/plane/utils/paginator.py index 2b8c27f76..0793d2a30 100644 --- a/apiserver/plane/utils/paginator.py +++ b/apiserver/plane/utils/paginator.py @@ -150,6 +150,8 @@ class OffsetPaginator: raise BadPaginationError("Pagination offset cannot be negative") results = queryset[offset:stop] + # Duplicate the queryset so it does not evaluate on any python ops + page_results = queryset[offset:stop].values("id") # Only slice from the end if we're going backwards (previous page) if cursor.value != limit and cursor.is_prev: @@ -164,7 +166,7 @@ class OffsetPaginator: # Check if there are more results available after the current page # Adjust cursors based on the results for pagination - next_cursor = Cursor(limit, page + 1, False, len(results) > limit) + next_cursor = Cursor(limit, page + 1, False, page_results.count() > limit) # If the page is greater than 0, then set the previous cursor prev_cursor = Cursor(limit, page - 1, True, page > 0)