django-pfx 1.4.dev86__tar.gz → 1.4.dev88__tar.gz

{django_pfx-1.4.dev86 → django_pfx-1.4.dev88}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-pfx
-Version: 1.4.dev86
+Version: 1.4.dev88
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev86 → django_pfx-1.4.dev88}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-pfx
-Version: 1.4.dev86
+Version: 1.4.dev88
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev86 → django_pfx-1.4.dev88}/pfx/pfxcore/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-31 09:52+0100\n"
+"POT-Creation-Date: 2025-02-05 08:33+0100\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -293,11 +293,11 @@ msgstr "{model} {obj} créé."
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1157
+#: views/rest_views.py:1164
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."
 
-#: views/rest_views.py:1256 views/rest_views.py:1296
+#: views/rest_views.py:1263 views/rest_views.py:1303
 msgid "Unexpected storage error"
 msgstr "Erreur de stockage inattendue"

{django_pfx-1.4.dev86 → django_pfx-1.4.dev88}/pfx/pfxcore/views/rest_views.py

@@ -775,6 +775,12 @@ class ListRestViewMixin(ModelResponseMixin):
                     pk=o.pk,
                     resource_name=str(o))
 
+    def pagination_count_queryset(self, qs):
+        return qs
+
+    def pagination_apply(self, qs, count_qs, offset, page_size):
+        return qs.all()[offset:offset + page_size]
+
     def pagination_result(self, qs):
         """Apply pagination on a queryset.
 
@@ -788,13 +794,14 @@ class ListRestViewMixin(ModelResponseMixin):
             page_size = min(page_size, settings.PFX_MAX_LIST_RESULT_SIZE)
         page = get_int(self.request.GET, 'page', 1)
         page_subset = get_int(self.request.GET, 'page_subset', 5)
-        count = qs.count()
+        cqs = self.pagination_count_queryset(qs)
+        count = cqs.count()
         page_count = (1 + (count - 1) // page_size) or 1
         offset = (page - 1) * page_size
         subset_first = min(
             max(page - page_subset // 2, 1),
             max(page_count - page_subset + 1, 1))
-        qs = qs.all()[offset:offset + page_size]
+        qs = self.pagination_apply(qs, cqs, offset, page_size)
         return qs, dict(
             page_size=page_size,
             page=page,