fix: clamp page if it exceeds the maximum page

aminalaee · Sep 9, 2024 · b67054c · b67054c
1 parent e5e7d50
commit b67054c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/sqladmin/models.py b/sqladmin/models.py
@@ -810,6 +810,9 @@ async def list(self, request: Request) -> Pagination:
         else:
             count = await self.count(request)
 
+        # Clamp page
+        page = min(page, max(1, count // page_size + 1))
+
         stmt = stmt.limit(page_size).offset((page - 1) * page_size)
         rows = await self._run_query(stmt)
 

diff --git a/sqladmin/pagination.py b/sqladmin/pagination.py
@@ -52,6 +52,9 @@ def resize(self, page_size: int) -> Pagination:
         return self
 
     def add_pagination_urls(self, base_url: URL) -> None:
+        # Clamp page
+        self.page = min(self.page, max(1, self.count // self.page_size + 1))
+
         # Previous pages
         for p in range(self.page - min(self.max_page_controls, 3), self.page):
             if p > 0:

diff --git a/tests/test_application.py b/tests/test_application.py
@@ -177,7 +177,7 @@ class UserAdmin(ModelView, model=User):
     client = TestClient(app)
 
     response = client.get("/admin/user/list?page=10000")
-    assert response.status_code == 400
+    assert response.status_code == 200
 
     response = client.get("/admin/user/list?page=aaaa")
     assert response.status_code == 400