Pass page_size to ImageChooserViewSet

wagtail/admin/views/generic/chooser.py

@@ -119,7 +119,7 @@ class BaseChooseView(
     of objects to choose from
     """
 
-    items_per_page = 10
+    per_page = 10
     ordering = None
     chosen_url_name = None
     chosen_multiple_url_name = None
@@ -242,7 +242,7 @@ class BaseChooseView(
         objects = self.apply_object_list_ordering(objects)
         objects = self.filter_object_list(objects)
 
-        paginator = Paginator(objects, per_page=self.items_per_page)
+        paginator = Paginator(objects, per_page=self.per_page)
         try:
             return paginator.page(request.GET.get("p", 1))
         except InvalidPage:

wagtail/documents/views/chooser.py

@@ -58,7 +58,7 @@ class DocumentCreationFormMixin(CreationFormMixin):
 
 class BaseDocumentChooseView(BaseChooseView):
     results_template_name = "wagtaildocs/chooser/results.html"
-    items_per_page = 10
+    per_page = 10
     ordering = "-created_at"
     construct_queryset_hook_name = "construct_document_chooser_queryset"
 

wagtail/images/views/chooser.py

@@ -72,7 +72,7 @@ class ImageCreationFormMixin(CreationFormMixin):
 class BaseImageChooseView(BaseChooseView):
     template_name = "wagtailimages/chooser/chooser.html"
     results_template_name = "wagtailimages/chooser/results.html"
-    items_per_page = getattr(settings, "WAGTAILIMAGES_CHOOSER_PAGE_SIZE", 12)
+    per_page = 12
     ordering = "-created_at"
     construct_queryset_hook_name = "construct_image_chooser_queryset"
 
@@ -309,6 +309,7 @@ class ImageChooserViewSet(ChooserViewSet):
     preserve_url_parameters = ChooserViewSet.preserve_url_parameters + ["select_format"]
 
     icon = "image"
+    per_page = getattr(settings, "WAGTAILIMAGES_CHOOSER_PAGE_SIZE", 10)
     choose_one_text = _("Choose an image")
     create_action_label = _("Upload")
     create_action_clicked_label = _("Uploading…")

wagtail/snippets/tests/test_viewset.py

@@ -399,9 +399,9 @@ class TestPagination(BaseSnippetViewSetTests):
         choose_results_url = reverse(chooser_viewset.get_url_name("choose_results"))
         response = self.client.get(choose_url)
 
-        # Default is 25 per page
+        # Default is 10 per page
         self.assertEqual(Advert.objects.all().count(), 32)
-        self.assertContains(response, "Page 1 of 2")
+        self.assertContains(response, "Page 1 of 4")
         self.assertContains(response, "Next")
         self.assertContains(response, choose_results_url + "?p=2")
 
@@ -413,7 +413,7 @@ class TestPagination(BaseSnippetViewSetTests):
 
         # FullFeaturedSnippet is set to display 15 per page
         self.assertEqual(FullFeaturedSnippet.objects.all().count(), 32)
-        # self.assertContains(response, "Page 1 of 3")
+        self.assertContains(response, "Page 1 of 3")
         self.assertContains(response, "Next")
         self.assertContains(response, choose_results_url + "?p=2")
 

wagtail/snippets/views/chooser.py

@@ -20,7 +20,7 @@ class BaseSnippetChooseView(BaseChooseView):
     filter_form_class = None
     page_title = _("Choose")
     results_template_name = "wagtailsnippets/chooser/results.html"
-    items_per_page = 25
+    per_page = 25
 
     @property
     def page_subtitle(self):