fixed pagination for prefiltered selects

Arfey · Apr 5, 2024 · aa3d548 · aa3d548
1 parent 07412d0
commit aa3d548
Showing 1 changed file with 4 additions and 16 deletions.
diff --git a/aiohttp_admin2/resources/postgres_resource/postgres_resource.py b/aiohttp_admin2/resources/postgres_resource/postgres_resource.py
@@ -162,22 +162,10 @@ async def get_list(
                 res.append(self._row_to_instance(r, res))
 
             if cursor is None:
-                if filters:
-                    count: int = await self._execute_scalar(
-                        conn,
-                        self.apply_filters(
-                            query=(
-                                sa.select(func.count(self._primary_key))
-                                .select_from(self.table)
-                            ),
-                            filters=filters,
-                        )
-                    )
-                else:
-                    count: int = await self._execute_scalar(
-                        conn,
-                        sa.select(func.count()).select_from(self.table)
-                    )
+                count: int = await self._execute_scalar(
+                    conn,
+                    sa.select(func.count()).select_from(query)
+                )
                 return self.create_paginator(
                     instances=res,
                     limit=limit,