Fix entries per page selected value (#9213)

Fixes #9212

CHANGELOG.txt

@@ -54,6 +54,7 @@ Changelog
  * Fix: Regression from Markdown conversion in documentation for API configuration - update to correctly use PEP-8 for example code (Storm Heg)
  * Fix: Prevent 'Delete' link on page edit view from redirecting back to the deleted page (LB (Ben) Johnston)
  * Fix: Prevent JS error on images index view when collections dropdown is omitted (Tidiane Dia)
+ * Fix: Prevent "Entries per page" dropdown on images index view from reverting to 10 (Tidiane Dia)
 
 
 4.0.1 (05.09.2022)

docs/releases/4.0.2.md

@@ -29,3 +29,4 @@ depth: 1
  * Regression from Markdown conversion in documentation for API configuration - update to correctly use PEP-8 for example code (Storm Heg)
  * Prevent 'Delete' link on page edit view from redirecting back to the deleted page (LB (Ben) Johnston)
  * Prevent JS error on images index view when collections dropdown is omitted (Tidiane Dia)
+ * Prevent "Entries per page" dropdown on images index view from reverting to 10 (Tidiane Dia)

wagtail/images/templates/wagtailimages/images/index.html

@@ -66,8 +66,8 @@
                     </select>
                 {% endfield %}
 
-                {% trans "Entries per page" as entries_per_page %}
-                {% field label_text=entries_per_page id_for_label="entries_per_page" %}
+                {% trans "Entries per page" as entries_per_page_label %}
+                {% field label_text=entries_per_page_label id_for_label="entries_per_page_label" %}
                     <select id="entries_per_page" name="entries_per_page">
                         {% for value in ENTRIES_PER_PAGE_CHOICES %}
                             <option value="{{ value }}" {% if entries_per_page == value %}selected="selected"{% endif %}>{{ value }}</option>

wagtail/images/tests/test_admin_views.py

@@ -78,6 +78,12 @@ class TestImageIndexView(TestCase, WagtailTestUtils):
             response = self.get({"p": page})
             self.assertEqual(response.status_code, 200)
 
+    def test_per_page(self):
+        response = self.get({"entries_per_page": 60})
+        self.assertContains(
+            response, '<option value="60" selected="selected">60</option>', html=True
+        )
+
     def test_pagination_preserves_other_params(self):
         root_collection = Collection.get_first_root_node()
         evil_plans_collection = root_collection.add_child(name="Evil plans")