diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a36900cb7a..010f58a92f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,6 +6,7 @@ Changelog * Optimize and consolidate redirects report view into the index view (Jake Howard, Dan Braghis) * Support a `HOSTNAMES` parameter on `WAGTAILFRONTENDCACHE` to define which hostnames a backend should respond to (Jake Howard, sponsored by Oxfam America) + * Fix: Make `WAGTAILIMAGES_CHOOSER_PAGE_SIZE` setting functional again (Rohit Sharma) 6.1 (xx.xx.xxxx) - IN DEVELOPMENT diff --git a/docs/releases/6.2.md b/docs/releases/6.2.md index 98ce119529..bbeefa9f28 100644 --- a/docs/releases/6.2.md +++ b/docs/releases/6.2.md @@ -19,7 +19,8 @@ depth: 1 ### Bug fixes - * ... + * Make `WAGTAILIMAGES_CHOOSER_PAGE_SIZE` setting functional again (Rohit Sharma) + ### Documentation diff --git a/wagtail/images/views/chooser.py b/wagtail/images/views/chooser.py index ce1792f440..bc4879be81 100644 --- a/wagtail/images/views/chooser.py +++ b/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" - 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…")