wagtail 6.3.2__py3-none-any.whl → 6.4rc1__py3-none-any.whl

wagtail/admin/templates/wagtailadmin/workflows/create.html

@@ -5,7 +5,7 @@
     {{ edit_handler.render_form_content }}
 
     <div class="w-form-width">
-        {% panel id="workflow-pages" icon="doc-empty-inverse" heading=_("Assign your workflow to pages") %}
+        {% panel id="workflow-pages" icon="doc-empty-inverse" heading=_("Assign your workflow to pages") attrs=pages_formset.attrs %}
             {% include "wagtailadmin/workflows/includes/workflow_pages_formset.html" with formset=pages_formset %}
         {% endpanel %}
 

wagtail/admin/templates/wagtailadmin/workflows/edit.html

@@ -5,7 +5,7 @@
     {{ edit_handler.render_form_content }}
 
     <div class="w-form-width">
-        {% panel id="workflow-pages" icon="doc-empty-inverse" heading=_("Assign your workflow to pages") %}
+        {% panel id="workflow-pages" icon="doc-empty-inverse" heading=_("Assign your workflow to pages") attrs=pages_formset.attrs %}
             {% if workflow.active %}
                 <p class="help-block help-info">
                     {% icon name='help' %}

wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_form.html

@@ -5,5 +5,5 @@
 </td>
 
 <td>
-    <button class="button button-small no" type="button" id="{{ form.DELETE.id_for_label }}-button">{% trans "Delete" %}</button>
+    <button class="button button-small no" type="button" id="{{ form.DELETE.id_for_label }}-button" data-action="w-formset#delete">{% trans "Delete" %}</button>
 </td>

wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_formset.html

@@ -17,12 +17,12 @@
     <thead>
         <tr>
             <th>{% trans "Page" %}</th>
-            <th></th>
+            <th aria-label="{% trans 'Action' %}"></th>
         </tr>
     </thead>
-    <tbody id="id_{{ formset.prefix }}-FORMS">
+    <tbody id="id_{{ formset.prefix }}-FORMS" data-w-formset-target="forms">
         {% for form in formset.forms %}
-            <tr id="inline_child_{{ form.prefix }}"{% if form.DELETE.value %} style="display: none;"{% endif %}>
+            <tr id="inline_child_{{ form.prefix }}"{% if form.DELETE.value %} hidden data-w-formset-target="deleted"{% else %} data-w-formset-target="child"{% endif %}>
                 {% if form.non_field_errors %}
                     <p class="error-message">
                         {% for error in form.non_field_errors %}
@@ -36,29 +36,12 @@
     </tbody>
 </table>
 
-<template id="id_{{ formset.prefix }}-EMPTY_FORM_TEMPLATE">
-    <tr id="inline_child_{{ formset.empty_form.prefix }}">
+<template id="id_{{ formset.prefix }}-EMPTY_FORM_TEMPLATE" data-w-formset-target="template">
+    <tr id="inline_child_{{ formset.empty_form.prefix }}" data-w-formset-target="child">
         {% include "wagtailadmin/workflows/includes/workflow_pages_form.html" with form=formset.empty_form only %}
     </tr>
 </template>
 
 <p class="add">
-    <button class="button bicolor button--icon" id="id_{{ formset.prefix }}-ADD" value="Add" type="button">{% icon name="plus" wrapped=1 %}{% trans "Assign to another page" %}</button>
+    <button class="button bicolor button--icon" id="id_{{ formset.prefix }}-ADD" value="Add" type="button" data-action="w-formset#add">{% icon name="plus" wrapped=1 %}{% trans "Assign to another page" %}</button>
 </p>
-
-
-<script>
-    $(function() {
-        buildExpandingFormset('id_{{ formset.prefix|escapejs }}', {
-            onInit: function(index) {
-                var deleteInputId = 'id_{{ formset.prefix|escapejs }}-' + index + '-DELETE';
-                var childId = 'inline_child_{{ formset.prefix|escapejs }}-' + index;
-                $('#' + deleteInputId + '-button').on('click', function() {
-                    /* set 'deleted' form field to true */
-                    $('#' + deleteInputId).val('1');
-                    $('#' + childId).fadeOut();
-                });
-            }
-        });
-    });
-</script>

wagtail/admin/templatetags/wagtailadmin_tags.py

@@ -654,8 +654,19 @@ def avatar_url(user, size=50, gravatar_only=False):
     """
     A template tag that receives a user and size and return
     the appropriate avatar url for that user.
+
+    If the 'get_avatar_url' hook is defined, then that will intercept this
+    logic and point to whatever resource that function returns. In this way,
+    users can swap out the Wagtail UserProfile avatar for some other image or
+    field of their own choosing without needing to alter anything on the
+    existing models.
+
     Example usage: {% avatar_url request.user 50 %}
+
     """
+    for hook_fn in hooks.get_hooks("get_avatar_url"):
+        if url := hook_fn(user, size):
+            return url
 
     if (
         not gravatar_only
@@ -972,6 +983,7 @@ def wagtail_config(context):
         "ADMIN_URLS": {
             "DISMISSIBLES": reverse("wagtailadmin_dismissibles"),
             "PAGES": reverse("wagtailadmin_explore_root"),
+            "BLOCK_PREVIEW": reverse("wagtailadmin_block_preview"),
         },
         "I18N_ENABLED": i18n_enabled(),
         "LOCALES": locales(serialize=False),

wagtail/admin/templatetags/wagtailuserbar.py

@@ -2,13 +2,13 @@ from django import template
 from django.template.loader import render_to_string
 from django.utils import translation
 
-from wagtail import hooks
 from wagtail.admin.userbar import (
     AccessibilityItem,
     AddPageItem,
     AdminItem,
     EditPageItem,
     ExplorePageItem,
+    apply_userbar_hooks,
 )
 from wagtail.models import PAGE_TEMPLATE_VAR, Page, Revision
 from wagtail.users.models import UserProfile
@@ -89,8 +89,7 @@ def wagtailuserbar(context, position="bottom-right"):
                 AccessibilityItem(),
             ]
 
-        for fn in hooks.get_hooks("construct_wagtail_userbar"):
-            fn(request, items)
+        apply_userbar_hooks(request, items, page)
 
         # Render the items
         rendered_items = [item.render(request) for item in items]

wagtail/admin/tests/pages/test_create_page.py

@@ -9,7 +9,13 @@ from django.urls import reverse
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
-from wagtail.models import GroupPagePermission, Locale, Page, Revision
+from wagtail.models import (
+    GroupPagePermission,
+    Locale,
+    Page,
+    PageViewRestriction,
+    Revision,
+)
 from wagtail.signals import page_published
 from wagtail.test.testapp.models import (
     BusinessChild,
@@ -421,6 +427,26 @@ class TestPageCreation(WagtailTestUtils, TestCase):
         )
         self.assertRedirects(response, "/admin/")
 
+    def test_create_page_defined_before_admin_load(self):
+        """
+        Test that a page model defined before wagtail.admin is loaded has all fields present
+        """
+        response = self.client.get(
+            reverse(
+                "wagtailadmin_pages:add",
+                args=("earlypage", "earlypage", self.root_page.id),
+            )
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailadmin/pages/create.html")
+        # Title field should be present and have TitleFieldPanel behaviour
+        # including syncing with slug
+        self.assertContains(response, 'data-w-sync-target-value="#id_slug"')
+        # SEO title should be present in promote tab
+        self.assertContains(
+            response, "The name of the page displayed on search engine results"
+        )
+
     def test_create_simplepage_post(self):
         post_data = {
             "title": "New page!",
@@ -1975,3 +2001,86 @@ class TestCommenting(WagtailTestUtils, TestCase):
         self.assertEqual("page-edit-form", form["id"])
         self.assertIn("w-init", form["data-controller"])
         self.assertEqual("", form["data-w-init-event-value"])
+
+
+class TestCreateViewChildPagePrivacy(WagtailTestUtils, TestCase):
+    def setUp(self):
+        self.login()
+
+        self.homepage = Page.objects.get(id=2)
+
+        self.private_parent_page = self.homepage.add_child(
+            instance=SimplePage(
+                title="Private Parent page",
+                content="hello",
+                live=True,
+            )
+        )
+
+        PageViewRestriction.objects.create(
+            page=self.private_parent_page,
+            restriction_type="password",
+            password="password123",
+        )
+
+        self.private_child_page = self.private_parent_page.add_child(
+            instance=SimplePage(
+                title="child page",
+                content="hello",
+                live=True,
+            )
+        )
+
+        self.public_parent_page = self.homepage.add_child(
+            instance=SimplePage(
+                title="Public Parent page",
+                content="hello",
+                live=True,
+            )
+        )
+
+        self.public_child_page = self.public_parent_page.add_child(
+            instance=SimplePage(
+                title="public page",
+                content="hello",
+                live=True,
+            )
+        )
+
+    def test_sidebar_private(self):
+        response = self.client.get(
+            reverse(
+                "wagtailadmin_pages:add",
+                args=("tests", "simplepage", self.private_child_page.id),
+            )
+        )
+
+        self.assertEqual(response.status_code, 200)
+
+        soup = self.get_soup(response.content)
+
+        public_div = soup.select_one('[data-w-zone-switch-key-value="isPublic"]')
+        private_div = soup.select_one('[data-w-zone-switch-key-value="!isPublic"]')
+
+        self.assertEqual(private_div["class"], ["!w-my-0"])
+
+        self.assertEqual(public_div["class"], ["w-hidden"])
+
+    def test_sidebar_public(self):
+        response = self.client.get(
+            reverse(
+                "wagtailadmin_pages:add",
+                args=("tests", "simplepage", self.public_child_page.id),
+            )
+        )
+
+        self.assertEqual(response.status_code, 200)
+
+        soup = self.get_soup(response.content)
+
+        public_div = soup.select_one('[data-w-zone-switch-key-value="isPublic"]')
+        private_div = soup.select_one('[data-w-zone-switch-key-value="!isPublic"]')
+
+        self.assertEqual(public_div["class"], [])
+
+        self.assertEqual(private_div["class"], ["!w-my-0", "w-hidden"])

wagtail/admin/tests/pages/test_edit_page.py

@@ -167,7 +167,7 @@ class TestPageEdit(WagtailTestUtils, TestCase):
             response,
             '<label class="w-field__label" for="id_speakers-__prefix__-last_name" id="id_speakers-__prefix__-last_name-label">',
         )
-        self.assertContains(response, "Add speakers")
+        self.assertContains(response, "Add speaker")
         self.assertContains(response, "Put the keynote speaker first")
 
         # Test MultiFieldPanel help text
@@ -289,7 +289,8 @@ class TestPageEdit(WagtailTestUtils, TestCase):
         self.assertEqual(len(actions), 0)
 
     def test_usage_count_information_shown(self):
-        PageChooserModel.objects.create(page=self.event_page)
+        with self.captureOnCommitCallbacks(execute=True):
+            PageChooserModel.objects.create(page=self.event_page)
 
         # Tests that the edit page loads
         response = self.client.get(

wagtail/admin/tests/pages/test_explorer_view.py

@@ -653,6 +653,24 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
         self.assertIn("Simple page", page_type_labels)
         self.assertNotIn("Page", page_type_labels)
 
+    @override_settings(WAGTAIL_I18N_ENABLED=True)
+    def test_filter_by_locale_and_search(self):
+        fr_locale = Locale.objects.create(language_code="fr")
+        self.root_page.copy_for_translation(fr_locale, copy_parents=True)
+
+        response = self.client.get(
+            reverse("wagtailadmin_explore", args=(self.root_page.id,)),
+            {"locale": "en", "q": "hello"},
+        )
+        self.assertEqual(response.status_code, 200)
+        page_ids = {page.id for page in response.context["pages"]}
+        self.assertIn(self.child_page.id, page_ids)
+        self.assertContainsActiveFilter(
+            response,
+            "Locale: English",
+            "locale=en",
+        )
+
     def test_filter_by_date_updated(self):
         new_page_child = SimplePage(
             title="New page child",

wagtail/admin/tests/pages/test_page_usage.py

@@ -19,13 +19,14 @@ class TestPageUsage(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         self.user = self.login()
         self.root_page = Page.objects.get(id=2)
 
-        page = SimplePage(
-            title="Hello world!",
-            slug="hello-world",
-            content="hello",
-        )
-        self.root_page.add_child(instance=page)
-        page.save_revision().publish()
+        with self.captureOnCommitCallbacks(execute=True):
+            page = SimplePage(
+                title="Hello world!",
+                slug="hello-world",
+                content="hello",
+            )
+            self.root_page.add_child(instance=page)
+            page.save_revision().publish()
         self.page = SimplePage.objects.get(id=page.id)
 
     def test_simple(self):
@@ -69,7 +70,8 @@ class TestPageUsage(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         self.assertIn("button", classes)
 
     def test_has_private_usage(self):
-        PageChooserModel.objects.create(page=self.page)
+        with self.captureOnCommitCallbacks(execute=True):
+            PageChooserModel.objects.create(page=self.page)
         usage_url = reverse("wagtailadmin_pages:usage", args=(self.page.id,))
         response = self.client.get(usage_url)
 
@@ -82,16 +84,17 @@ class TestPageUsage(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         self.assertContains(response, "<td>Page chooser model</td>", html=True)
 
     def test_has_editable_usage(self):
-        form_page = FormPageWithRedirect(
-            title="Contact us",
-            slug="contact-us",
-            to_address="to@email.com",
-            from_address="from@email.com",
-            subject="The subject",
-            thank_you_redirect_page=self.page,
-        )
-
-        form_page = self.root_page.add_child(instance=form_page)
+        with self.captureOnCommitCallbacks(execute=True):
+            form_page = FormPageWithRedirect(
+                title="Contact us",
+                slug="contact-us",
+                to_address="to@email.com",
+                from_address="from@email.com",
+                subject="The subject",
+                thank_you_redirect_page=self.page,
+            )
+
+            form_page = self.root_page.add_child(instance=form_page)
 
         usage_url = reverse("wagtailadmin_pages:usage", args=(self.page.id,))
         response = self.client.get(usage_url)
@@ -111,8 +114,9 @@ class TestPageUsage(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         self.assertContains(response, "<td>Form page with redirect</td>", html=True)
 
     def test_pagination(self):
-        for _ in range(50):
-            PageChooserModel.objects.create(page=self.page)
+        with self.captureOnCommitCallbacks(execute=True):
+            for _ in range(50):
+                PageChooserModel.objects.create(page=self.page)
 
         usage_url = reverse("wagtailadmin_pages:usage", args=(self.page.id,))
         response = self.client.get(f"{usage_url}?p=2")

wagtail/admin/tests/pages/test_preview.py

@@ -6,8 +6,9 @@ from django.urls import reverse
 from django.utils import timezone
 from freezegun import freeze_time
 
+from wagtail.admin.staticfiles import versioned_static
 from wagtail.admin.views.pages.preview import PreviewOnEdit
-from wagtail.models import Page
+from wagtail.models import Page, Site
 from wagtail.test.testapp.models import (
     CustomPreviewSizesPage,
     EventCategory,
@@ -159,6 +160,7 @@ class TestPreview(WagtailTestUtils, TestCase):
             '<h1 class="preview-error__title">Preview not available</h1>',
             html=True,
         )
+        self.assertNotContains(response, versioned_static("wagtailadmin/js/icons.js"))
 
     def test_preview_on_create_with_invalid_data(self):
         preview_url = reverse(
@@ -198,6 +200,7 @@ class TestPreview(WagtailTestUtils, TestCase):
             '<h1 class="preview-error__title">Preview not available</h1>',
             html=True,
         )
+        self.assertNotContains(response, versioned_static("wagtailadmin/js/icons.js"))
 
     def test_preview_on_create_with_m2m_field(self):
         preview_url = reverse(
@@ -228,6 +231,39 @@ class TestPreview(WagtailTestUtils, TestCase):
         self.assertContains(response, "<li>Parties</li>")
         self.assertContains(response, "<li>Holidays</li>")
 
+    def test_preview_on_create_with_incorrect_site_hostname(self):
+        # Failing to set a valid hostname in the Site record (as determined by ALLOWED_HOSTS)
+        # should not prevent the preview from being generated.
+        Site.objects.filter(is_default_site=True).update(hostname="bad.example.com")
+
+        preview_url = reverse(
+            "wagtailadmin_pages:preview_on_add",
+            args=("tests", "eventpage", self.home_page.id),
+        )
+        response = self.client.post(preview_url, self.post_data)
+
+        # Check the JSON response
+        self.assertEqual(response.status_code, 200)
+        self.assertJSONEqual(
+            response.content.decode(),
+            {"is_valid": True, "is_available": True},
+        )
+
+        # Check the user can refresh the preview
+        preview_session_key = "wagtail-preview-tests-eventpage-{}".format(
+            self.home_page.id
+        )
+        self.assertIn(preview_session_key, self.client.session)
+
+        response = self.client.get(preview_url)
+
+        # Check the HTML response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "tests/event_page.html")
+        self.assertContains(response, "Beach party")
+        self.assertContains(response, "<li>Parties</li>")
+        self.assertContains(response, "<li>Holidays</li>")
+
     def test_preview_on_edit_with_m2m_field(self):
         preview_url = reverse(
             "wagtailadmin_pages:preview_on_edit", args=(self.event_page.id,)
@@ -254,6 +290,36 @@ class TestPreview(WagtailTestUtils, TestCase):
         self.assertContains(response, "<li>Parties</li>")
         self.assertContains(response, "<li>Holidays</li>")
 
+    def test_preview_on_edit_with_incorrect_site_hostname(self):
+        # Failing to set a valid hostname in the Site record (as determined by ALLOWED_HOSTS)
+        # should not prevent the preview from being generated.
+        Site.objects.filter(is_default_site=True).update(hostname="bad.example.com")
+
+        preview_url = reverse(
+            "wagtailadmin_pages:preview_on_edit", args=(self.event_page.id,)
+        )
+        response = self.client.post(preview_url, self.post_data)
+
+        # Check the JSON response
+        self.assertEqual(response.status_code, 200)
+        self.assertJSONEqual(
+            response.content.decode(),
+            {"is_valid": True, "is_available": True},
+        )
+
+        # Check the user can refresh the preview
+        preview_session_key = f"wagtail-preview-{self.event_page.id}"
+        self.assertIn(preview_session_key, self.client.session)
+
+        response = self.client.get(preview_url)
+
+        # Check the HTML response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "tests/event_page.html")
+        self.assertContains(response, "Beach party")
+        self.assertContains(response, "<li>Parties</li>")
+        self.assertContains(response, "<li>Holidays</li>")
+
     def test_preview_on_edit_with_valid_then_invalid_data(self):
         preview_url = reverse(
             "wagtailadmin_pages:preview_on_edit", args=(self.event_page.id,)
@@ -355,6 +421,7 @@ class TestPreview(WagtailTestUtils, TestCase):
             '<h1 class="preview-error__title">Preview not available</h1>',
             html=True,
         )
+        self.assertNotContains(response, versioned_static("wagtailadmin/js/icons.js"))
 
     def test_preview_on_edit_clear_preview_data(self):
         preview_session_key = f"wagtail-preview-{self.event_page.id}"
@@ -390,6 +457,7 @@ class TestPreview(WagtailTestUtils, TestCase):
             '<h1 class="preview-error__title">Preview not available</h1>',
             html=True,
         )
+        self.assertNotContains(response, versioned_static("wagtailadmin/js/icons.js"))
 
     def test_preview_modes(self):
         preview_url = reverse(

wagtail/admin/tests/pages/test_revisions.py

@@ -14,6 +14,7 @@ from wagtail.test.testapp.models import (
     SecretPage,
 )
 from wagtail.test.utils import WagtailTestUtils
+from wagtail.test.utils.template_tests import AdminTemplateTestUtils
 from wagtail.test.utils.timestamps import local_datetime
 
 
@@ -119,12 +120,17 @@ class TestRevisions(WagtailTestUtils, TestCase):
         # Form should show the content of the revision, not the current draft
         self.assertContains(response, "Last Christmas I gave you my heart")
 
-        # Form should include a hidden 'revision' field
-        revision_field = (
-            """<input type="hidden" name="revision" value="%d" />"""
-            % self.last_christmas_revision.id
+        # Form should use the revisions revert URL as the action
+        soup = self.get_soup(response.content)
+        form = soup.select_one("form[data-edit-form]")
+        self.assertIsNotNone(form)
+        self.assertEqual(
+            form.get("action"),
+            reverse(
+                "wagtailadmin_pages:revisions_revert",
+                args=(self.christmas_event.id, self.last_christmas_revision.id),
+            ),
         )
-        self.assertContains(response, revision_field)
 
         # Buttons should be relabelled
         self.assertContains(response, "Replace current draft")
@@ -199,9 +205,10 @@ class TestStreamRevisions(WagtailTestUtils, TestCase):
         )
 
 
-class TestCompareRevisions(WagtailTestUtils, TestCase):
+class TestCompareRevisions(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
     # Actual tests for the comparison classes can be found in test_compare.py
 
+    base_breadcrumb_items = []
     fixtures = ["test.json"]
 
     def setUp(self):
@@ -246,6 +253,33 @@ class TestCompareRevisions(WagtailTestUtils, TestCase):
             html=True,
         )
 
+        history_url = reverse(
+            "wagtailadmin_pages:history", args=(self.christmas_event.id,)
+        )
+
+        self.assertBreadcrumbsItemsRendered(
+            [
+                {
+                    "url": reverse("wagtailadmin_explore_root")
+                    if page.is_root()
+                    else reverse("wagtailadmin_explore", args=(page.pk,)),
+                    "label": page.get_admin_display_title(),
+                }
+                for page in self.christmas_event.get_ancestors(inclusive=True)
+            ]
+            + [
+                {"url": history_url, "label": "History"},
+                {"url": "", "label": "Compare", "sublabel": "This Christmas"},
+            ],
+            response.content,
+        )
+
+        soup = self.get_soup(response.content)
+        edit_url = reverse("wagtailadmin_pages:edit", args=(self.christmas_event.id,))
+        edit_button = soup.select_one(f"a.w-header-button[href='{edit_url}']")
+        self.assertIsNotNone(edit_button)
+        self.assertEqual(edit_button.text.strip(), "Edit")
+
     def test_compare_revisions_earliest(self):
         compare_url = reverse(
             "wagtailadmin_pages:revisions_compare",

wagtail/admin/tests/test_account_management.py

@@ -19,6 +19,7 @@ from wagtail.admin.localization import (
 from wagtail.admin.views.account import AccountView, profile_tab
 from wagtail.images.tests.utils import get_test_image_file
 from wagtail.test.utils import WagtailTestUtils
+from wagtail.test.utils.template_tests import AdminTemplateTestUtils
 from wagtail.users.models import UserProfile
 
 
@@ -238,7 +239,9 @@ class TestAccountSectionUtilsMixin:
         return self.client.post(reverse("wagtailadmin_account"), post_data)
 
 
-class TestAccountSection(WagtailTestUtils, TestCase, TestAccountSectionUtilsMixin):
+class TestAccountSection(
+    AdminTemplateTestUtils, TestAccountSectionUtilsMixin, WagtailTestUtils, TestCase
+):
     """
     This tests that the accounts section is working
     """
@@ -282,6 +285,14 @@ class TestAccountSection(WagtailTestUtils, TestCase, TestAccountSectionUtilsMixi
         # Check if the default title exists
         self.assertContains(response, "Name and Email")
 
+        soup = self.get_soup(response.content)
+        self.assertBreadcrumbsItemsRendered(
+            [{"url": "", "label": "Account"}], response.content
+        )
+        heading = soup.select_one("main h2")
+        self.assertIsNotNone(heading)
+        self.assertEqual(heading.text.strip(), "Account")
+
     def test_change_name_post(self):
         response = self.post_form(
             {
@@ -521,6 +532,17 @@ class TestAccountSection(WagtailTestUtils, TestCase, TestAccountSectionUtilsMixi
             get_available_admin_languages(), WAGTAILADMIN_PROVIDED_LANGUAGES
         )
 
+    @override_settings(LANGUAGE_CODE="id")
+    def test_default_language_follows_server_setting(self):
+        response = self.client.get(reverse("wagtailadmin_account"))
+        self.assertEqual(response.status_code, 200)
+        soup = self.get_soup(response.content)
+        option = soup.select_one(
+            'select[name="locale-preferred_language"] option[value=""]'
+        )
+        self.assertIsNotNone(option)
+        self.assertEqual(option.text.strip(), "Use server language: Bahasa Indonesia")
+
     @override_settings(WAGTAILADMIN_PERMITTED_LANGUAGES=[("en", "English")])
     def test_not_show_options_if_only_one_language_is_permitted(self):
         response = self.client.get(reverse("wagtailadmin_account"))
@@ -577,6 +599,22 @@ class TestAccountSection(WagtailTestUtils, TestCase, TestAccountSectionUtilsMixi
             sorted(zoneinfo.available_timezones()),
         )
 
+        response = self.client.get(reverse("wagtailadmin_account"))
+        self.assertEqual(response.status_code, 200)
+        soup = self.get_soup(response.content)
+
+        select = soup.select_one('select[name="locale-current_time_zone"]')
+        self.assertIsNotNone(select)
+        self.assertEqual(select.get("data-controller"), "w-init w-locale")
+        self.assertEqual(
+            select.get("data-action"),
+            "w-init:ready->w-locale#localizeTimeZoneOptions",
+        )
+        self.assertEqual(
+            select.get("data-w-locale-server-time-zone-param"),
+            settings.TIME_ZONE,
+        )
+
     @unittest.skipUnless(settings.USE_TZ, "Timezone support is disabled")
     @override_settings(WAGTAIL_USER_TIME_ZONES=["Europe/London"])
     def test_not_show_options_if_only_one_time_zone_is_permitted(self):

wagtail/admin/tests/test_audit_log.py

@@ -374,12 +374,14 @@ class TestAuditLogAdmin(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
 
         self.login(user=self.administrator)
         response = self.client.post(
-            reverse("wagtailadmin_pages:edit", args=(self.hello_page.id,)),
+            reverse(
+                "wagtailadmin_pages:revisions_revert",
+                args=(self.hello_page.id, revision.id),
+            ),
             {
                 "title": "Hello World!",
                 "content": "another hello",
                 "slug": "hello-world",
-                "revision": revision.id,
                 "action-publish": "action-publish",
             },
             follow=True,