wagtail 7.1.1__py3-none-any.whl → 7.2__py3-none-any.whl

wagtail/admin/templatetags/wagtailadmin_tags.py

@@ -206,6 +206,21 @@ def admin_url_name(obj, action):
     return obj.snippet_viewset.get_url_name(action)
 
 
+@register.simple_tag(takes_context=True)
+def build_absolute_url(context, url):
+    """
+    Usage: {% build_absolute_url url %}
+    Returns the absolute URL of the given URL based on the request's host.
+    If the request doesn't exist in the context, falls back to
+    WAGTAILADMIN_BASE_URL as the base URL.
+    If the given URL is already absolute, returns it unchanged.
+    """
+    request = context.get("request")
+    if not request:
+        return urljoin(get_admin_base_url(), url)
+    return request.build_absolute_uri(url)
+
+
 @register.simple_tag
 def latest_str(obj):
     """
@@ -900,9 +915,7 @@ def wagtail_config(context):
     request = context["request"]
     config = {
         "CSRF_TOKEN": get_token(request),
-        "CSRF_HEADER_NAME": HttpHeaders.parse_header_name(
-            getattr(settings, "CSRF_HEADER_NAME")
-        ),
+        "CSRF_HEADER_NAME": HttpHeaders.parse_header_name(settings.CSRF_HEADER_NAME),
         "ADMIN_API": {
             "PAGES": reverse("wagtailadmin_api:pages:listing"),
             "DOCUMENTS": reverse("wagtailadmin_api:documents:listing"),
@@ -1175,6 +1188,7 @@ def formattedfield(
     label_text=None,
     error_message_id=None,
     wrapper_id=None,
+    attrs=None,
 ):
     """
     Renders a form field in standard Wagtail admin layout.
@@ -1192,12 +1206,15 @@ def formattedfield(
     - `label_text` - Manually set this if the field’s HTML is hard-coded.
     - `error_message_id` - ID of the error message container element.
     - `wrapper_id` - ID of the overall wrapper element.
+    - `attrs` - Dict of additional HTML attributes to add to the field wrapper element, `data-field-wrapper` will be included by default.
     """
 
     label_for = id_for_label or (field and field.id_for_label) or ""
 
     context = {
         "classname": classname,
+        # Ensure data-field-wrapper is always present
+        "attrs": {**(attrs or {}), "data-field-wrapper": True},
         "show_label": show_label,
         "sr_only_label": sr_only_label,
         "icon": icon,
@@ -1319,15 +1336,42 @@ def keyboard_shortcuts_dialog(context):
     appropriate shortcuts for the user's platform.
     Note: Shortcut keys are intentionally not translated.
     """
+    request = context.get("request")
+    keyboard_shortcuts_enabled = True
+
+    if request and getattr(request, "user", None):
+        profile = getattr(request.user, "wagtail_userprofile", None)
+        if profile is not None:
+            keyboard_shortcuts_enabled = bool(
+                getattr(profile, "keyboard_shortcuts", True)
+            )
 
     comments_enabled = get_comments_enabled()
-    user_agent = context["request"].headers.get("User-Agent", "")
+    user_agent = request.headers.get("User-Agent", "") if request else ""
     is_mac = re.search(r"Mac|iPod|iPhone|iPad", user_agent)
-    KEYS = get_keyboard_key_labels_from_request(context["request"])
+    KEYS = get_keyboard_key_labels_from_request(request) if request else {}
 
     return {
+        "keyboard_shortcuts_enabled": keyboard_shortcuts_enabled,
         "shortcuts": {
-            ("actions-common", _("Common actions")): [
+            # Translators: Shortcuts for admin common shortcuts that are available across the admin
+            ("admin-common", _("Application")): [
+                (_("Show keyboard shortcuts"), "?"),
+                (_("Search"), "/"),
+                (_("Toggle sidebar"), "["),
+                (_("Toggle minimap"), "]"),
+                (_("Close modal dialogs (like this one)"), f"{KEYS.ESC}"),
+            ],
+            # Translators: Shortcuts for admin actions that can be taken while working on core models
+            ("admin-core-models", _("Actions")): [
+                (_("Save changes"), f"{KEYS.MOD} + s"),
+                (_("Preview"), f"{KEYS.MOD} + p"),
+                (_("Add or show comments"), f"{KEYS.CTRL} + {KEYS.ALT} + m")
+                if comments_enabled
+                else None,
+            ],
+            # Translators: Shortcuts for common text editing features available in all fields (even if not a rich text field)
+            ("text-editing-basic", _("Text editing")): [
                 (_("Copy"), f"{KEYS.MOD} + c"),
                 (_("Cut"), f"{KEYS.MOD} + x"),
                 (_("Paste"), f"{KEYS.MOD} + v"),
@@ -1343,27 +1387,17 @@ def keyboard_shortcuts_dialog(context):
                     f"{KEYS.MOD} + {KEYS.SHIFT} + z" if is_mac else f"{KEYS.MOD} + y",
                 ),
             ],
-            ("actions-model", _("Actions")): [
-                (_("Save changes"), f"{KEYS.MOD} + s"),
-                (_("Preview"), f"{KEYS.MOD} + p"),
-                (_("Toggle sidebar"), "["),
-                (_("Toggle minimap"), "]"),
-                (_("Add or show comments"), f"{KEYS.CTRL} + {KEYS.ALT} + m")
-                if comments_enabled
-                else None,
-            ],
-            ("rich-text-content", _("Text content")): [
-                (_("Insert or edit a link"), f"{KEYS.MOD} + k")
-            ],
-            ("rich-text-formatting", _("Text formatting")): [
+            # Translators: Shortcuts for formatting & editing features available in rich text fields
+            ("text-editing-rich-text", _("Text formatting")): [
+                (_("Insert or edit a link"), f"{KEYS.MOD} + k"),
+                (_("Bold"), f"{KEYS.MOD} + b"),
                 (_("Italic"), f"{KEYS.MOD} + i"),
-                (_("Underline"), f"{KEYS.MOD} + u"),
                 (_("Monospace (code)"), f"{KEYS.MOD} + j"),
-                (_("Strike-through"), f"{KEYS.MOD} + x"),
+                (_("Strike-through"), f"{KEYS.MOD} + {KEYS.SHIFT} + x"),
                 (_("Superscript"), f"{KEYS.MOD} + ."),
                 (_("Subscript"), f"{KEYS.MOD} + ,"),
             ],
-        }
+        },
     }
 
 

wagtail/admin/tests/api/test_pages.py

@@ -1378,7 +1378,7 @@ class TestCopyPageAction(AdminAPITestCase, TestCase):
             content,
             {
                 "detail": (
-                    "You do not have permission to publish a page at the destination"
+                    "You do not have permission to publish a page at the destination."
                 )
             },
         )
@@ -1407,7 +1407,7 @@ class TestCopyPageAction(AdminAPITestCase, TestCase):
             content,
             {
                 "slug": [
-                    "The slug 'events' is already in use within the parent page at '/'"
+                    "The slug 'events' is already in use within the parent page at '/'."
                 ]
             },
         )
@@ -1517,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 delete this page"}
+            content, {"detail": "You do not have permission to delete this page."}
         )
 
         # Page is still there
@@ -1565,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 publish this page"}
+            content, {"detail": "You do not have permission to publish this page."}
         )
 
     def test_publish_alias_page(self):
@@ -1655,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 unpublish this page"}
+            content, {"detail": "You do not have permission to unpublish this page."}
         )
 
 
@@ -1969,7 +1969,7 @@ class TestCreatePageAliasAction(AdminAPITestCase, TestCase):
             content,
             {
                 "detail": (
-                    "You do not have permission to publish a page at the destination"
+                    "You do not have permission to publish a page at the destination."
                 ),
             },
         )
@@ -2028,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 edit this page"}
+            content, {"detail": "You do not have permission to edit this page."}
         )
 
     def test_revert_to_page_revision_without_revision_id(self):

wagtail/admin/tests/api/test_renderer_classes.py

@@ -6,6 +6,7 @@ from django.urls import reverse
 from rest_framework.renderers import BrowsableAPIRenderer, JSONRenderer
 
 from wagtail.admin.api.views import PagesAdminAPIViewSet
+from wagtail.test.numberformat import ignore_numberformat
 from wagtail.test.utils import WagtailTestUtils
 
 
@@ -59,3 +60,18 @@ class TestPagesAdminAPIRendererClasses(WagtailTestUtils, TestCase):
         content = json.loads(response.content.decode("UTF-8"))
         self.assertIn("meta", content)
         self.assertIn("items", content)
+
+    def test_api_response_returns_html_with_html_accept_header(self):
+        """Test that API returns HTML when HTML is explicitly requested via Accept header."""
+        with ignore_numberformat(["rest_framework/base.html"]):
+            response = self.client.get(
+                reverse("wagtailadmin_api:pages:listing"), HTTP_ACCEPT="text/html"
+            )
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response["Content-Type"], "text/html; charset=utf-8")
+
+        # Should contain HTML content
+        content = response.content.decode("UTF-8")
+        self.assertIn("<html", content)
+        self.assertIn("</html>", content)

wagtail/admin/tests/pages/test_create_page.py

@@ -544,6 +544,26 @@ class TestPageCreation(WagtailTestUtils, TestCase):
             post_data,
         )
 
+        soup = self.get_soup(response.content)
+        header_messages = soup.css.select(".messages[role='status'] ul > li")
+
+        # the top level message should indicate that the page could not be created
+        self.assertEqual(len(header_messages), 1)
+        message = header_messages[0]
+        self.assertIn(
+            "The page could not be created due to validation errors", message.get_text()
+        )
+
+        # the top level message should provide a go to error button
+        buttons = message.find_all("button")
+        self.assertEqual(len(buttons), 1)
+        self.assertEqual(buttons[0].attrs["data-controller"], "w-count w-focus")
+        self.assertEqual(
+            set(buttons[0].attrs["data-action"].split()),
+            {"click->w-focus#focus", "wagtail:panel-init@document->w-count#count"},
+        )
+        self.assertIn("Go to the first error", buttons[0].get_text())
+
         # Check that a form error was raised
         self.assertFormError(
             response.context["form"], "title", "This field is required."
@@ -760,6 +780,26 @@ class TestPageCreation(WagtailTestUtils, TestCase):
         )
         self.assertEqual(response.status_code, 200)
 
+        soup = self.get_soup(response.content)
+        header_messages = soup.css.select(".messages[role='status'] ul > li")
+
+        # the top level message should indicate that the page could not be created
+        self.assertEqual(len(header_messages), 1)
+        message = header_messages[0]
+        self.assertIn(
+            "The page could not be created due to validation errors", message.get_text()
+        )
+
+        # the top level message should provide a go to error button
+        buttons = message.find_all("button")
+        self.assertEqual(len(buttons), 1)
+        self.assertEqual(buttons[0].attrs["data-controller"], "w-count w-focus")
+        self.assertEqual(
+            set(buttons[0].attrs["data-action"].split()),
+            {"click->w-focus#focus", "wagtail:panel-init@document->w-count#count"},
+        )
+        self.assertIn("Go to the first error", buttons[0].get_text())
+
         # Check that a form error was raised
         self.assertFormError(
             response.context["form"], "date_from", "This field is required."
@@ -1144,7 +1184,7 @@ class TestPageCreation(WagtailTestUtils, TestCase):
         self.assertFormError(
             response.context["form"],
             "expire_at",
-            "Expiry date/time must be in the future",
+            "Expiry date/time must be in the future.",
         )
 
         self.assertContains(
@@ -1328,7 +1368,7 @@ class TestPageCreation(WagtailTestUtils, TestCase):
         self.assertFormError(
             response.context["form"],
             "slug",
-            "The slug 'hello-world' is already in use within the parent page",
+            "The slug 'hello-world' is already in use within the parent page.",
         )
 
         # form should be marked as having unsaved changes for the purposes of the dirty-forms warning

wagtail/admin/tests/pages/test_edit_page.py

@@ -32,6 +32,7 @@ from wagtail.test.testapp.models import (
     EVENT_AUDIENCE_CHOICES,
     Advert,
     AdvertPlacement,
+    CommentableJSONPage,
     CustomPermissionPage,
     EventCategory,
     EventPage,
@@ -883,7 +884,7 @@ class TestPageEdit(WagtailTestUtils, TestCase):
         self.assertFormError(
             response.context["form"],
             "expire_at",
-            "Expiry date/time must be in the future",
+            "Expiry date/time must be in the future.",
         )
 
         self.assertContains(
@@ -1749,7 +1750,7 @@ class TestPageEdit(WagtailTestUtils, TestCase):
         self.assertFormError(
             response.context["form"],
             "slug",
-            "The slug 'hello-world' is already in use within the parent page",
+            "The slug 'hello-world' is already in use within the parent page.",
         )
 
     def test_preview_on_edit(self):
@@ -2986,12 +2987,31 @@ class TestValidationErrorMessages(WagtailTestUtils, TestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        self.assertContains(
-            response, "The page could not be saved due to validation errors"
+        soup = self.get_soup(response.content)
+
+        header_messages = soup.css.select(".messages[role='status'] ul > li")
+
+        # the top level message should indicate that the page could not be saved
+        self.assertEqual(len(header_messages), 1)
+        message = header_messages[0]
+        self.assertIn(
+            "The page could not be saved due to validation errors", message.get_text()
         )
+
+        # the top level message should provide a go to error button
+        buttons = message.find_all("button")
+        self.assertEqual(len(buttons), 1)
+        self.assertEqual(buttons[0].attrs["data-controller"], "w-count w-focus")
+        self.assertIn("Go to the first error", buttons[0].get_text())
+
         # the error should only appear once: against the field, not in the header message
-        self.assertContains(response, "error-message", count=1)
-        self.assertContains(response, "This field is required", count=1)
+        error_messages = soup.css.select(".error-message")
+        self.assertEqual(len(error_messages), 1)
+        error_message = error_messages[0]
+        self.assertEqual(
+            error_message.parent["id"], "panel-child-content-child-title-errors"
+        )
+        self.assertIn("This field is required", error_message.get_text())
 
     def test_non_field_error(self):
         """Non-field errors should be shown in the header message"""
@@ -3070,19 +3090,43 @@ class TestValidationErrorMessages(WagtailTestUtils, TestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        self.assertContains(
-            response, "The page could not be saved due to validation errors"
+        soup = self.get_soup(response.content)
+
+        # there should be top level messages should indicate that the page could not be saved alongside other messages
+        header_messages = soup.css.select(".messages[role='status'] ul > li")
+        self.assertEqual(len(header_messages), 3)
+
+        # the first header message should indicate that the page could not be saved & contain a go to error button
+        self.assertIn(
+            "The page could not be saved due to validation errors",
+            header_messages[0].get_text(),
         )
-        self.assertContains(
-            response, "<li>The end date must be after the start date</li>", count=1
+        buttons = header_messages[0].find_all("button")
+        self.assertEqual(len(buttons), 1)
+        self.assertEqual(buttons[0].attrs["data-controller"], "w-count w-focus")
+        self.assertIn("Go to the first error", buttons[0].get_text())
+
+        # the second should be a general message about the title, no go to error button
+        self.assertIn(
+            "Title: This field is required",
+            header_messages[1].get_text(),
+        )
+        self.assertEqual(len(header_messages[1].find_all("button")), 0)
+
+        # the third header message should be the non-field error
+        self.assertIn(
+            "The end date must be after the start date",
+            header_messages[2].get_text(),
         )
 
         # Error on title shown against the title field
-        self.assertContains(response, "error-message", count=1)
-        # Error on title shown in the header message
-        self.assertContains(
-            response, "<li>Title: This field is required.</li>", count=1
+        error_messages = soup.css.select(".error-message")
+        self.assertEqual(len(error_messages), 1)
+        error_message = error_messages[0]
+        self.assertEqual(
+            error_message.parent["id"], "panel-child-content-child-title-errors"
         )
+        self.assertIn("This field is required.", error_message.get_text())
 
 
 class TestNestedInlinePanel(WagtailTestUtils, TestCase):
@@ -4107,3 +4151,73 @@ class TestCommentOutput(WagtailTestUtils, TestCase):
         comment_text = [comment["text"] for comment in comments_data["comments"]]
         comment_text.sort()
         self.assertEqual(comment_text, ["A test comment", "This is quite expensive"])
+
+    def test_comments_with_deep_contentpath_on_custom_fields(self):
+        page = CommentableJSONPage(
+            title="Commentable JSON Page",
+            slug="commentable-json-page",
+            commentable_body={
+                "header": {
+                    "title": "Comments are Welcome",
+                },
+            },
+            uncommentable_body={
+                "title": "No feedback here",
+            },
+            stream_body=[
+                {
+                    "id": "1",
+                    "type": "text",
+                    "value": "This allows comments",
+                }
+            ],
+        )
+        self.root_page.add_child(instance=page)
+
+        Comment.objects.create(
+            page=page,
+            user=self.user,
+            text="1. Comment on an existing JSON path in commentable JSONField",
+            contentpath="commentable_body.header.title",
+        )
+        Comment.objects.create(
+            page=page,
+            user=self.user,
+            text="2. Comment on a non-existing JSON path in commentable JSONField",
+            contentpath="commentable_body.header.not_valid",
+        )
+        Comment.objects.create(
+            page=page,
+            user=self.user,
+            text="3. Comment on an existing JSON path in base JSONField",
+            contentpath="uncommentable_body.title",
+        )
+        Comment.objects.create(
+            page=page,
+            user=self.user,
+            text="4. Comment on a non-existing JSON path in base JSONField",
+            contentpath="uncommentable_body.not_valid",
+        )
+        Comment.objects.create(
+            page=page,
+            user=self.user,
+            text="5. Comment on the top-level of a base JSONField",
+            contentpath="uncommentable_body",
+        )
+
+        response = self.client.get(reverse("wagtailadmin_pages:edit", args=[page.id]))
+        soup = self.get_soup(response.content)
+        comments_data_json = soup.select_one("#comments-data").string
+        comments_data = json.loads(comments_data_json)
+        comment_text = [comment["text"] for comment in comments_data["comments"]]
+        comment_text.sort()
+
+        self.assertEqual(
+            comment_text,
+            [
+                # Custom fields can define which paths are valid for comments
+                "1. Comment on an existing JSON path in commentable JSONField",
+                # Comments directly on the top-level (the field itself) are always valid
+                "5. Comment on the top-level of a base JSONField",
+            ],
+        )

wagtail/admin/tests/pages/test_explorer_view.py

@@ -180,13 +180,15 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
         self.root_page.add_child(instance=event_page)
 
         orderings = {
-            "content_type": (
-                [self.new_page.id, self.old_page.id, event_page.id],
-                "-content_type",
+            "content_type__model": (
+                # SimplePage, SingleEventPage, StandardIndex
+                [self.new_page.id, event_page.id, self.old_page.id],
+                "-content_type__model",
             ),
-            "-content_type": (
-                [event_page.id, self.old_page.id, self.new_page.id],
-                "content_type",
+            "-content_type__model": (
+                # StandardIndex, SingleEventPage, SimplePage
+                [self.old_page.id, event_page.id, self.new_page.id],
+                "content_type__model",
             ),
         }
         url = reverse("wagtailadmin_explore", args=(self.root_page.id,))
@@ -345,7 +347,31 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
         )
 
         # Pages must not be paginated
-        self.assertNotIsInstance(response.context["pages"], paginator.Page)
+        self.assertNotIsInstance(response.context["page_obj"], paginator.Page)
+
+    def test_reordering_disabled_when_searching_or_filtering(self):
+        standard_index_ct = ContentType.objects.get_for_model(StandardIndex).pk
+        cases = [
+            {"q": "old"},
+            {"content_type": standard_index_ct},
+            {"content_type": standard_index_ct, "q": "old"},
+        ]
+        for query in cases:
+            with self.subTest(query=query):
+                response = self.client.get(
+                    reverse("wagtailadmin_explore", args=(self.root_page.id,)),
+                    {"ordering": "ord", **query},
+                )
+                self.assertEqual(response.status_code, 200)
+                self.assertTemplateUsed(
+                    response, "wagtailadmin/pages/explorable_index.html"
+                )
+                self.assertEqual(
+                    response.context["ordering"],
+                    "-latest_revision_created_at",
+                )
+                # Pages is paginated
+                self.assertIsInstance(response.context["page_obj"], paginator.Page)
 
     def test_construct_explorer_page_queryset_hook(self):
         # testapp implements a construct_explorer_page_queryset hook
@@ -421,6 +447,7 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
         self.assertTemplateUsed(response, "wagtailadmin/pages/explorable_index.html")
 
         # Check that we got the correct page
+        self.assertIsInstance(response.context["page_obj"], paginator.Page)
         self.assertEqual(response.context["page_obj"].number, 2)
         self.assertContains(response, "51-100 of 153")
 

wagtail/admin/tests/pages/test_reorder_page.py

@@ -70,6 +70,17 @@ class TestPageReorder(WagtailTestUtils, TestCase):
         child_slugs = self.index_page.get_children().values_list("slug", flat=True)
         self.assertListEqual(list(child_slugs), ["child-2", "child-3", "child-1"])
 
+    def test_page_set_page_position_non_integer_position_moves_it_to_the_end(self):
+        response = self.client.post(
+            reverse("wagtailadmin_pages:set_page_position", args=(self.child_1.id,))
+            + "?position=good"
+        )
+        self.assertEqual(response.status_code, 200)
+
+        # check if child_1 is the last child page:
+        child_slugs = self.index_page.get_children().values_list("slug", flat=True)
+        self.assertListEqual(list(child_slugs), ["child-2", "child-3", "child-1"])
+
     def test_page_move_page_position_up(self):
         """Moves child 3 to the first position."""
         response = self.client.post(

wagtail/admin/tests/test_collections_views.py

@@ -781,6 +781,18 @@ class TestSetCollectionPrivacy(CollectionInstanceTestUtils, WagtailTestUtils, Te
             params,
         )
 
+    def test_privacy_for_collection(self):
+        response = self.get(self.finance_collection.id)
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailadmin/shared/set_privacy.html")
+        self.assertEqual(response.context["object"], self.finance_collection)
+        self.assertEqual(
+            response.context["action_url"],
+            "/admin/collections/{}/privacy/".format(self.finance_collection.id),
+        )
+
     def test_get_private_child(self):
         CollectionViewRestriction.objects.create(
             collection=self.root_collection,

wagtail/admin/tests/test_edit_handlers.py

@@ -1,7 +1,7 @@
 from collections.abc import Mapping
 from datetime import date, datetime, timezone
 from functools import wraps
-from typing import Any, Optional
+from typing import Any
 from unittest import mock
 
 from django import VERSION as DJANGO_VERSION
@@ -871,8 +871,8 @@ class TestFieldPanel(TestCase):
 
     def _get_form(
         self,
-        data: Optional[Mapping[str, Any]] = None,
-        fields: Optional[list[str]] = None,
+        data: Mapping[str, Any] | None = None,
+        fields: list[str] | None = None,
     ) -> WagtailAdminPageForm:
         cls = get_form_for_model(
             EventPage,

wagtail/admin/tests/test_filters.py

@@ -75,7 +75,7 @@ class TestFilteredModelChoiceField(WagtailTestUtils, TestCase):
             users = FilteredModelChoiceField(
                 queryset=User.objects.order_by(User.USERNAME_FIELD),
                 filter_field="id_group",
-                filter_accessor=lambda user: user.groups.all(),
+                filter_accessor=lambda user: user.groups.all().order_by("name"),
             )
 
         form = UserForm()
@@ -83,7 +83,7 @@ class TestFilteredModelChoiceField(WagtailTestUtils, TestCase):
         expected_html = """
             <select name="users" data-widget="filtered-select" data-filter-field="id_group" required id="id_users">
                 <option value="" selected>---------</option>
-                <option value="{david}" data-filter-value="{musicians},{actors}">{david_username}</option>
+                <option value="{david}" data-filter-value="{actors},{musicians}">{david_username}</option>
                 <option value="{kevin}" data-filter-value="{actors}">{kevin_username}</option>
                 <option value="{morten}" data-filter-value="{musicians}">{morten_username}</option>
             </select>