wagtail 6.0.1__py3-none-any.whl → 6.1rc1__py3-none-any.whl

wagtail/admin/templatetags/wagtailadmin_tags.py

@@ -1,5 +1,6 @@
+import datetime
 import json
-from datetime import datetime
+import re
 from urllib.parse import urljoin
 from warnings import warn
 
@@ -40,6 +41,7 @@ from wagtail.admin.utils import (
     get_valid_next_url_from_request,
 )
 from wagtail.admin.views.bulk_action.registry import bulk_action_registry
+from wagtail.admin.views.pages.utils import get_breadcrumbs_items_for_page
 from wagtail.admin.widgets import Button, ButtonWithDropdown, PageListingButton
 from wagtail.coreutils import (
     accepts_kwarg,
@@ -55,7 +57,6 @@ from wagtail.models import (
     Page,
     PageViewRestriction,
 )
-from wagtail.permissions import page_permission_policy
 from wagtail.telepath import JSContext
 from wagtail.users.utils import get_gravatar_url
 from wagtail.utils.deprecation import RemovedInWagtail70Warning
@@ -67,11 +68,16 @@ register.filter("naturaltime", naturaltime)
 
 
 @register.inclusion_tag("wagtailadmin/shared/breadcrumbs.html")
-def breadcrumbs(items, is_expanded=False, classname=None):
-    return {"items": items, "is_expanded": is_expanded, "classname": classname}
+def breadcrumbs(items, is_expanded=False, classname=None, icon_name=None):
+    return {
+        "items": items,
+        "is_expanded": is_expanded or len(items) == 1,
+        "classname": classname,
+        "icon_name": icon_name,
+    }
 
 
-@register.inclusion_tag("wagtailadmin/shared/page_breadcrumbs.html", takes_context=True)
+@register.inclusion_tag("wagtailadmin/shared/breadcrumbs.html", takes_context=True)
 def page_breadcrumbs(
     context,
     page,
@@ -79,38 +85,33 @@ def page_breadcrumbs(
     url_root_name=None,
     include_self=True,
     is_expanded=False,
-    page_perms=None,
-    querystring_value=None,
+    querystring_value="",
     trailing_breadcrumb_title=None,
     classname=None,
+    icon_name=None,
 ):
     user = context["request"].user
 
-    # find the closest common ancestor of the pages that this user has direct explore permission
-    # (i.e. add/edit/publish/lock) over; this will be the root of the breadcrumb
-    cca = page_permission_policy.explorable_root_instance(user)
-    if not cca:
-        return {"items": Page.objects.none()}
-
-    items = (
-        page.get_ancestors(inclusive=include_self)
-        .descendant_of(cca, inclusive=True)
-        .specific()
+    items = get_breadcrumbs_items_for_page(
+        page,
+        user,
+        url_name,
+        url_root_name,
+        include_self,
+        querystring_value,
     )
 
+    if trailing_breadcrumb_title:
+        items.append({"label": trailing_breadcrumb_title})
+
     if len(items) == 1:
         is_expanded = True
 
     return {
         "items": items,
-        "current_page": page,
         "is_expanded": is_expanded,
-        "page_perms": page_perms,
-        "querystring_value": querystring_value or "",
-        "trailing_breadcrumb_title": trailing_breadcrumb_title,  # Only used in collapsible breadcrumb templates
-        "url_name": url_name,
-        "url_root_name": url_root_name,
         "classname": classname,
+        "icon_name": icon_name,
     }
 
 
@@ -223,7 +224,15 @@ def classnames(*classes):
     Usage <div class="{% classnames "w-base" classname active|yesno:"w-base--active," any_other_var %}"></div>
     Returns any args as a space-separated joined string for using in HTML class names.
     """
-    return " ".join([classname.strip() for classname in classes if classname])
+
+    flattened = []
+    for classname in classes:
+        if isinstance(classname, str):
+            flattened.append(classname)
+        elif hasattr(classname, "__iter__"):
+            flattened.extend(classname)
+
+    return " ".join([classname.strip() for classname in flattened if classname])
 
 
 @register.simple_tag(takes_context=True)
@@ -657,7 +666,12 @@ def admin_theme_classname(context):
         if hasattr(user, "wagtail_userprofile")
         else "system"
     )
-    return f"w-theme-{theme_name}"
+    density_name = (
+        user.wagtail_userprofile.density
+        if hasattr(user, "wagtail_userprofile")
+        else "default"
+    )
+    return f"w-theme-{theme_name} w-density-{density_name}"
 
 
 @register.simple_tag
@@ -752,7 +766,6 @@ def timesince_simple(d):
     1 week, 1 day ago -> 1 week ago
     0 minutes ago -> just now
     """
-    # Note: Duplicate code in timesince_last_update()
     time_period = timesince(d).split(",")[0]
     if time_period == avoid_wrapping(_("0 minutes")):
         return _("just now")
@@ -771,11 +784,25 @@ def timesince_last_update(
     """
     # translation usage below is intentionally verbose to be easier to work with translations
 
-    if last_update.date() == datetime.today().date():
+    current_datetime = timezone.now()
+    if timezone.is_aware(current_datetime):
+        # timezone support is enabled - make last_update timezone-aware and set to the user's
+        # timezone
+        current_datetime = timezone.localtime(current_datetime)
         if timezone.is_aware(last_update):
-            time_str = timezone.localtime(last_update).strftime("%H:%M")
+            local_datetime = timezone.localtime(last_update)
         else:
-            time_str = last_update.strftime("%H:%M")
+            local_datetime = timezone.make_aware(last_update)
+    else:
+        # timezone support is disabled - use naive datetimes
+        if timezone.is_aware(last_update):
+            local_datetime = timezone.make_naive(last_update)
+        else:
+            local_datetime = last_update
+
+    # Use an explicit timestamp if last_update is today as seen in the current user's time zone
+    if local_datetime.date() == current_datetime.date():
+        time_str = local_datetime.strftime("%H:%M")
 
         if show_time_prefix:
             if user_display_name:
@@ -795,17 +822,9 @@ def timesince_last_update(
                 return time_str
     else:
         if use_shorthand:
-            # Note: Duplicate code in timesince_simple()
-            time_period = timesince(last_update).split(",")[0]
-            if time_period == avoid_wrapping(_("0 minutes")):
-                if user_display_name:
-                    return _("just now by %(user_display_name)s") % {
-                        "user_display_name": user_display_name
-                    }
-                else:
-                    return _("just now")
+            time_period = timesince(local_datetime, now=current_datetime).split(",")[0]
         else:
-            time_period = timesince(last_update)
+            time_period = timesince(local_datetime, now=current_datetime)
 
         if user_display_name:
             return _("%(time_period)s ago by %(user_display_name)s") % {
@@ -1288,12 +1307,70 @@ def workflow_status_with_date(workflow_state):
     return _("%(status_display)s %(task_name)s %(started_at)s") % translation_context
 
 
+@register.inclusion_tag(
+    "wagtailadmin/shared/keyboard_shortcuts_dialog.html",
+    takes_context=True,
+)
+def keyboard_shortcuts_dialog(context):
+    """
+    Renders the keyboard shortcuts dialog content with the
+    appropriate shortcuts for the user's platform.
+    Note: Shortcut keys are intentionally not translated.
+    """
+
+    user_agent = context["request"].headers.get("User-Agent", "")
+    is_mac = re.search(r"Mac|iPod|iPhone|iPad", user_agent)
+    modifier = "⌘" if is_mac else "Ctrl"
+
+    return {
+        "shortcuts": {
+            ("actions-common", _("Common actions")): [
+                (_("Copy"), f"{modifier} + c"),
+                (_("Cut"), f"{modifier} + x"),
+                (_("Paste"), f"{modifier} + v"),
+                (
+                    _("Paste and match style")
+                    if is_mac
+                    else _("Paste without formatting"),
+                    f"{modifier} + Shift + v",
+                ),
+                (_("Undo"), f"{modifier} + z"),
+                (
+                    _("Redo"),
+                    f"{modifier} + Shift + z" if is_mac else f"{modifier} + y",
+                ),
+            ],
+            ("actions-model", _("Actions")): [
+                (_("Save changes"), f"{modifier} + s"),
+                (_("Preview"), f"{modifier} + p"),
+            ],
+            ("rich-text-content", _("Text content")): [
+                (_("Insert or edit a link"), f"{modifier} + k")
+            ],
+            ("rich-text-formatting", _("Text formatting")): [
+                (_("Bold"), f"{modifier} + b"),
+                (_("Italic"), f"{modifier} + i"),
+                (_("Underline"), f"{modifier} + u"),
+                (_("Monospace (code)"), f"{modifier} + j"),
+                (_("Strike-through"), f"{modifier} + x"),
+                (_("Superscript"), f"{modifier} + ."),
+                (_("Subscript"), f"{modifier} + ,"),
+            ],
+        }
+    }
+
+
 @register.inclusion_tag("wagtailadmin/shared/human_readable_date.html")
 def human_readable_date(date, description=None, placement="top"):
+    if isinstance(date, datetime.datetime):
+        tooltip_format = getattr(settings, "DATETIME_FORMAT", "N j, Y, P")
+    elif isinstance(date, datetime.date):
+        tooltip_format = getattr(settings, "DATE_FORMAT", "N j, Y")
     return {
         "date": date,
         "description": description,
         "placement": placement,
+        "tooltip_format": tooltip_format,
     }
 
 

wagtail/admin/tests/api/test_pages.py

@@ -1310,7 +1310,7 @@ class TestCopyPageAction(AdminAPITestCase, TestCase):
         self.assertEqual(response.status_code, 403)
         content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(
-            content, {"detail": "You do not have permission to perform this action."}
+            content, {"detail": "You do not have permission to copy this page"}
         )
 
     def test_recursively_copy_into_self(self):
@@ -1348,7 +1348,7 @@ class TestCopyPageAction(AdminAPITestCase, TestCase):
         self.assertEqual(response.status_code, 403)
         content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(
-            content, {"detail": "You do not have permission to perform this action."}
+            content, {"detail": "You do not have permission to copy this page"}
         )
 
     def test_without_publish_permissions_at_destination_with_keep_live(self):
@@ -1375,7 +1375,12 @@ class TestCopyPageAction(AdminAPITestCase, TestCase):
         self.assertEqual(response.status_code, 403)
         content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(
-            content, {"detail": "You do not have permission to perform this action."}
+            content,
+            {
+                "detail": (
+                    "You do not have permission to publish a page at the destination"
+                )
+            },
         )
 
     def test_respects_page_creation_rules(self):
@@ -1385,7 +1390,7 @@ class TestCopyPageAction(AdminAPITestCase, TestCase):
         self.assertEqual(response.status_code, 403)
         content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(
-            content, {"detail": "You do not have permission to perform this action."}
+            content, {"detail": "You do not have permission to copy this page"}
         )
 
     def test_copy_page_slug_in_use(self):
@@ -1512,7 +1517,7 @@ class TestDeletePageAction(AdminAPITestCase, TestCase):
         self.assertEqual(response.status_code, 403)
         content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(
-            content, {"detail": "You do not have permission to perform this action."}
+            content, {"detail": "You do not have permission to delete this page"}
         )
 
         # Page is still there
@@ -1560,7 +1565,7 @@ class TestPublishPageAction(AdminAPITestCase, TestCase):
         self.assertEqual(response.status_code, 403)
         content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(
-            content, {"detail": "You do not have permission to perform this action."}
+            content, {"detail": "You do not have permission to publish this page"}
         )
 
     def test_publish_alias_page(self):
@@ -1650,7 +1655,7 @@ class TestUnpublishPageAction(AdminAPITestCase, TestCase):
         self.assertEqual(response.status_code, 403)
         content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(
-            content, {"detail": "You do not have permission to perform this action."}
+            content, {"detail": "You do not have permission to unpublish this page"}
         )
 
 
@@ -1682,7 +1687,13 @@ class TestMovePageAction(AdminAPITestCase, TestCase):
 
         content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(
-            content, {"detail": "You do not have permission to perform this action."}
+            content,
+            {
+                "detail": (
+                    "You do not have permission to move the page to the "
+                    "target specified."
+                ),
+            },
         )
 
     def test_move_page_without_destination_page_id(self):
@@ -1955,7 +1966,12 @@ class TestCreatePageAliasAction(AdminAPITestCase, TestCase):
 
         content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(
-            content, {"detail": "You do not have permission to perform this action."}
+            content,
+            {
+                "detail": (
+                    "You do not have permission to publish a page at the destination"
+                ),
+            },
         )
 
 
@@ -2012,7 +2028,7 @@ class TestRevertToPageRevisionAction(AdminAPITestCase, TestCase):
 
         content = json.loads(response.content.decode("utf-8"))
         self.assertEqual(
-            content, {"detail": "You do not have permission to perform this action."}
+            content, {"detail": "You do not have permission to edit this page"}
         )
 
     def test_revert_to_page_revision_without_revision_id(self):

wagtail/admin/tests/pages/test_create_page.py

@@ -1494,7 +1494,13 @@ class TestInlineStreamField(WagtailTestUtils, TestCase):
         self.assertEqual(response.status_code, 200)
 
         # response should include HTML declarations for streamfield child blocks
-        self.assertContains(response, '<div id="sections-__prefix__-body" data-block="')
+        self.assertContains(response, '<div id="sections-__prefix__-body" data-block')
+        soup = self.get_soup(response.content)
+        blockDiv = soup.find("div", {"data-controller": "w-block"})
+        self.assertIsNotNone(blockDiv)
+        # block div should contain this attributes
+        self.assertTrue(blockDiv.has_attr("data-w-block-arguments-value"))
+        self.assertTrue(blockDiv.has_attr("data-w-block-data-value"))
 
 
 class TestIssue2994(WagtailTestUtils, TestCase):
@@ -1806,7 +1812,7 @@ class TestPageSubscriptionSettings(WagtailTestUtils, TestCase):
         # Login
         self.user = self.login()
 
-    def test_commment_notifications_switched_on_by_default(self):
+    def test_comment_notifications_switched_on_by_default(self):
         response = self.client.get(
             reverse(
                 "wagtailadmin_pages:add",
@@ -1890,7 +1896,7 @@ class TestCommenting(WagtailTestUtils, TestCase):
         # Login
         self.user = self.login()
 
-    def test_commments_enabled_by_default(self):
+    def test_comments_enabled_by_default(self):
         response = self.client.get(
             reverse(
                 "wagtailadmin_pages:add",
@@ -1907,7 +1913,7 @@ class TestCommenting(WagtailTestUtils, TestCase):
         self.assertEqual("w-comments:init", form["data-w-init-event-value"])
 
     @override_settings(WAGTAILADMIN_COMMENTS_ENABLED=False)
-    def test_commments_disabled(self):
+    def test_comments_disabled(self):
         response = self.client.get(
             reverse(
                 "wagtailadmin_pages:add",

wagtail/admin/tests/pages/test_custom_listing.py

@@ -0,0 +1,37 @@
+from django.test import TestCase
+
+from wagtail.test.utils import WagtailTestUtils
+from wagtail.test.utils.template_tests import AdminTemplateTestUtils
+
+
+class TestCustomListing(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
+    fixtures = ["test.json"]
+
+    def test_get(self):
+        self.login()
+        response = self.client.get("/admin/event_pages/")
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertContains(response, "Event pages")
+        self.assertContains(response, "Christmas")
+        self.assertContains(response, "Saint Patrick")
+        self.assertNotContains(response, "Welcome to the Wagtail test site!")
+        self.assertBreadcrumbsItemsRendered(
+            [{"url": "", "label": "Event pages"}],
+            response.content,
+        )
+        soup = self.get_soup(response.content)
+        breadcrumbs_icon = soup.select_one(".w-breadcrumbs__icon")
+        self.assertIsNotNone(breadcrumbs_icon)
+        use = breadcrumbs_icon.select_one("use")
+        self.assertIsNotNone(use)
+        self.assertEqual(use["href"], "#icon-calendar")
+
+    def test_filter(self):
+        self.login()
+        response = self.client.get("/admin/event_pages/", {"audience": "private"})
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertContains(response, "Event pages")
+        self.assertNotContains(response, "Christmas")
+        self.assertContains(response, "Saint Patrick")

wagtail/admin/tests/pages/test_edit_page.py

@@ -2067,7 +2067,7 @@ class TestPageEdit(WagtailTestUtils, TestCase):
         # as when running it within the full test suite
         self.client.get(reverse("wagtailadmin_pages:edit", args=(self.event_page.id,)))
 
-        with self.assertNumQueries(35):
+        with self.assertNumQueries(33):
             self.client.get(
                 reverse("wagtailadmin_pages:edit", args=(self.event_page.id,))
             )
@@ -2080,7 +2080,7 @@ class TestPageEdit(WagtailTestUtils, TestCase):
         # Warm up the cache as above.
         self.client.get(reverse("wagtailadmin_pages:edit", args=(self.event_page.id,)))
 
-        with self.assertNumQueries(39):
+        with self.assertNumQueries(37):
             self.client.get(
                 reverse("wagtailadmin_pages:edit", args=(self.event_page.id,))
             )
@@ -3088,7 +3088,7 @@ class TestPageSubscriptionSettings(WagtailTestUtils, TestCase):
         # Login
         self.user = self.login()
 
-    def test_commment_notifications_switched_off(self):
+    def test_comment_notifications_switched_off(self):
         response = self.client.get(
             reverse("wagtailadmin_pages:edit", args=[self.child_page.id])
         )
@@ -3104,7 +3104,7 @@ class TestPageSubscriptionSettings(WagtailTestUtils, TestCase):
             ).exists()
         )
 
-    def test_commment_notifications_switched_on(self):
+    def test_comment_notifications_switched_on(self):
         PageSubscription.objects.create(
             page=self.child_page, user=self.user, comment_notifications=True
         )
@@ -3247,7 +3247,7 @@ class TestCommenting(WagtailTestUtils, TestCase):
             [to for email in mail.outbox for to in email.to],
         )
 
-    def test_commments_enabled_by_default(self):
+    def test_comments_enabled_by_default(self):
         response = self.client.get(
             reverse("wagtailadmin_pages:edit", args=[self.child_page.id])
         )
@@ -3261,7 +3261,7 @@ class TestCommenting(WagtailTestUtils, TestCase):
         self.assertEqual("w-comments:init", form["data-w-init-event-value"])
 
     @override_settings(WAGTAILADMIN_COMMENTS_ENABLED=False)
-    def test_commments_disabled(self):
+    def test_comments_disabled(self):
         response = self.client.get(
             reverse("wagtailadmin_pages:edit", args=[self.child_page.id])
         )

wagtail/admin/tests/pages/test_explorer_view.py

@@ -59,12 +59,13 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
         self.assertEqual(active_filter.get_text(separator=" ", strip=True), text)
         self.assertIsNotNone(clear_button)
         self.assertNotIn(param, clear_button.attrs.get("data-w-swap-src-value"))
+        self.assertEqual(clear_button.attrs.get("data-w-swap-reflect-value"), "true")
 
     def test_explore(self):
         explore_url = reverse("wagtailadmin_explore", args=(self.root_page.id,))
         response = self.client.get(explore_url)
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
         self.assertEqual(self.root_page, response.context["parent_page"])
 
         # child pages should be most recent first
@@ -120,7 +121,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
     def test_explore_root(self):
         response = self.client.get(reverse("wagtailadmin_explore_root"))
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
         self.assertEqual(Page.objects.get(id=1), response.context["parent_page"])
         self.assertIn(self.root_page, response.context["pages"])
         # Should not contain a link to the history view
@@ -146,7 +147,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
             {"ordering": "title"},
         )
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
         self.assertEqual(response.context["ordering"], "title")
 
         # child pages should be ordered by title
@@ -212,7 +213,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
             reverse("wagtailadmin_explore", args=(self.root_page.id,))
         )
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
 
         # child pages should be ordered by title
         page_ids = [page.id for page in response.context["pages"]]
@@ -231,7 +232,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
             {"ordering": "-title"},
         )
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
         self.assertEqual(response.context["ordering"], "-title")
 
         # child pages should be ordered by title
@@ -246,7 +247,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
             {"ordering": "latest_revision_created_at"},
         )
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
         self.assertEqual(response.context["ordering"], "latest_revision_created_at")
 
         # child pages should be oldest revision first
@@ -262,7 +263,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
             {"ordering": "invalid_order"},
         )
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
         self.assertEqual(response.context["ordering"], "-latest_revision_created_at")
 
     def test_reordering(self):
@@ -271,7 +272,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
             {"ordering": "ord"},
         )
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
         self.assertEqual(response.context["ordering"], "ord")
 
         # child pages should be ordered by native tree order (i.e. by creation time)
@@ -292,7 +293,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
             {"polite_pages_only": "yes_please"},
         )
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
         page_ids = [page.id for page in response.context["pages"]]
         self.assertEqual(page_ids, [self.child_page.id])
 
@@ -333,7 +334,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
                     reverse("wagtailadmin_explore", args=(self.root_page.id,))
                 )
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
         self.assertContains(response, "Dummy Button")
         self.assertContains(response, "/dummy-button")
 
@@ -355,7 +356,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
                 reverse("wagtailadmin_explore", args=(self.root_page.id,))
             )
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
         self.assertContains(response, "Dummy Button")
         self.assertContains(response, "/dummy-button")
 
@@ -378,7 +379,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
 
         # Check response
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
 
         # Check that we got the correct page
         self.assertEqual(response.context["page_obj"].number, 2)
@@ -534,14 +535,14 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
             reverse("wagtailadmin_explore", args=(self.root_page.id,))
         )
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
 
         # try to browse into the page itself
         response = self.client.get(
             reverse("wagtailadmin_explore", args=(self.old_page.id,))
         )
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
 
     def test_search(self):
         response = self.client.get(
@@ -549,7 +550,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
             {"q": "old"},
         )
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/pages/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
 
         page_ids = [page.id for page in response.context["pages"]]
         self.assertEqual(page_ids, [self.old_page.id])
@@ -642,7 +643,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
 
         response = self.client.get(
             reverse("wagtailadmin_explore", args=(self.root_page.id,)),
-            {"latest_revision_created_at_after": "2015-01-01"},
+            {"latest_revision_created_at_from": "2015-01-01"},
         )
         self.assertEqual(response.status_code, 200)
         page_ids = {page.id for page in response.context["pages"]}
@@ -650,7 +651,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
         self.assertContainsActiveFilter(
             response,
             "Date updated: Jan. 1, 2015 -",
-            "latest_revision_created_at_after=2015-01-01",
+            "latest_revision_created_at_from=2015-01-01",
         )
 
     def test_filter_by_owner(self):
@@ -1270,7 +1271,7 @@ class TestInWorkflowStatus(WagtailTestUtils, TestCase):
         # Warm up cache
         self.client.get(self.url)
 
-        with self.assertNumQueries(51):
+        with self.assertNumQueries(47):
             response = self.client.get(self.url)
 
         self.assertEqual(response.status_code, 200)

wagtail/admin/tests/pages/test_move_page.py

@@ -243,7 +243,7 @@ class TestPageMove(WagtailTestUtils, TestCase):
 
     def test_page_move_after_parent_page_types_changes_to_different_parent_model(self):
         # Test for issue #10348
-        # While BusinesSubIndex cannot be created under a SimplePage, we can
+        # While BusinessSubIndex cannot be created under a SimplePage, we can
         # still create it under a SimplePage invoking django-treebeard's add_child
         # which works great for our purposes.
         self.assertFalse(BusinessSubIndex.can_exist_under(self.section_a))