wagtail 6.0rc1__py3-none-any.whl → 6.0.2__py3-none-any.whl

wagtail/admin/staticfiles.py

@@ -1,7 +1,9 @@
 import hashlib
+import os
 
-from django.conf import settings
+from django.conf import STATICFILES_STORAGE_ALIAS, settings
 from django.contrib.staticfiles.storage import HashedFilesMixin
+from django.core.files.storage import storages
 from django.templatetags.static import static
 
 from wagtail import __version__
@@ -22,17 +24,7 @@ except AttributeError:
         use_version_strings = True
     else:
         # see if we're using a storage backend using hashed filenames
-        try:
-            from django.conf import STATICFILES_STORAGE_ALIAS
-            from django.core.files.storage import storages
-
-            storage = storages[STATICFILES_STORAGE_ALIAS].__class__
-        except ImportError:
-            # DJANGO_VERSION < 4.2
-            from django.core.files.storage import get_storage_class
-
-            storage = get_storage_class(settings.STATICFILES_STORAGE)
-
+        storage = storages[STATICFILES_STORAGE_ALIAS].__class__
         use_version_strings = not issubclass(storage, HashedFilesMixin)
 
 
@@ -44,20 +36,31 @@ else:
     VERSION_HASH = None
 
 
-def versioned_static(path):
-    """
-    Wrapper for Django's static file finder to append a cache-busting query parameter
-    that updates on each Wagtail version
-    """
-    # An absolute path is returned unchanged (either a full URL, or processed already)
-    if path.startswith(("http://", "https://", "/")):
-        return path
+if os.environ.get("WAGTAIL_FAIL_ON_VERSIONED_STATIC", "0") == "1":
 
-    base_url = static(path)
+    def versioned_static(path):
+        raise Exception(
+            "`versioned_static` was called during application startup. This is not valid "
+            "as it will cause failures if collectstatic has not yet completed (e.g. during "
+            "the collectstatic command itself). Ensure that any media definitions declared "
+            "via `class Media` are converted to a `media` property."
+        )
+else:
 
-    # if URL already contains a querystring, don't add our own, to avoid interfering
-    # with existing mechanisms
-    if VERSION_HASH is None or "?" in base_url:
-        return base_url
-    else:
-        return base_url + "?v=" + VERSION_HASH
+    def versioned_static(path):
+        """
+        Wrapper for Django's static file finder to append a cache-busting query parameter
+        that updates on each Wagtail version
+        """
+        # An absolute path is returned unchanged (either a full URL, or processed already)
+        if path.startswith(("http://", "https://", "/")):
+            return path
+
+        base_url = static(path)
+
+        # if URL already contains a querystring, don't add our own, to avoid interfering
+        # with existing mechanisms
+        if VERSION_HASH is None or "?" in base_url:
+            return base_url
+        else:
+            return base_url + "?v=" + VERSION_HASH

wagtail/admin/templates/wagtailadmin/admin_base.html

@@ -56,6 +56,7 @@
     <script src="{% versioned_static 'wagtailadmin/js/wagtailadmin.js' %}"></script>
     <script src="{% versioned_static 'wagtailadmin/js/telepath/telepath.js' %}"></script>
     <script src="{% versioned_static 'wagtailadmin/js/sidebar.js' %}"></script>
+    <script src="{% versioned_static 'wagtailadmin/js/modal-workflow.js' %}"></script>
 
     {% hook_output 'insert_global_admin_js' %}
 

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

@@ -7,6 +7,5 @@
 
 {% block extra_js %}
     {{ block.super }}
-    <script src="{% versioned_static 'wagtailadmin/js/modal-workflow.js' %}"></script>
     <script src="{% versioned_static 'wagtailadmin/js/privacy-switch.js' %}"></script>
 {% endblock %}

wagtail/admin/templates/wagtailadmin/generic/form.html

@@ -44,6 +44,7 @@
 {% block extra_js %}
     {{ block.super }}
     {{ media.js }}
+    {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
 
 {% block extra_css %}

wagtail/admin/templates/wagtailadmin/generic/index_results.html

@@ -12,6 +12,14 @@
         </template>
     {% endif %}
 
+    {% if render_buttons_fragment %}
+        <template data-controller="w-teleport" data-w-teleport-target-value="#w-slim-header-buttons" data-w-teleport-reset-value="true">
+            {% for button in header_buttons %}
+                {% component button %}
+            {% endfor %}
+        </template>
+    {% endif %}
+
     {% if is_searching and view.show_other_searches %}
         <div class="nice-padding">
             {% search_other %}

wagtail/admin/templates/wagtailadmin/home/workflow_objects_to_moderate.html

@@ -89,7 +89,6 @@
         </table>
     {% endpanel %}
 
-    <script src="{% versioned_static 'wagtailadmin/js/modal-workflow.js' %}"></script>
     <script src="{% versioned_static 'wagtailadmin/js/workflow-action.js' %}"></script>
     <script>
         document.querySelectorAll('[data-controller="w-dropdown"]').forEach((e) => {

wagtail/admin/templates/wagtailadmin/pages/_editor_js.html

@@ -18,7 +18,6 @@
 <script src="{% versioned_static 'wagtailadmin/js/vendor/rangy-core.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/vendor/mousetrap.min.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/expanding-formset.js' %}"></script>
-<script src="{% versioned_static 'wagtailadmin/js/modal-workflow.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/page-editor.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/preview-panel.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/privacy-switch.js' %}"></script>

wagtail/admin/templates/wagtailadmin/pages/index.html

@@ -23,8 +23,6 @@
 {% block extra_js %}
     {{ block.super }}
 
-    {% comment %} modal-workflow is required by the view restrictions interface {% endcomment %}
-    <script src="{% versioned_static 'wagtailadmin/js/modal-workflow.js' %}"></script>
     <script src="{% versioned_static 'wagtailadmin/js/privacy-switch.js' %}"></script>
 
     {% comment %}

wagtail/admin/templates/wagtailadmin/pages/page_listing_header.html

@@ -3,7 +3,7 @@
 
 {% block breadcrumbs %}
     {# breadcrumbs #}
-    {% page_breadcrumbs parent_page 'wagtailadmin_explore' url_root_name='wagtailadmin_explore_root' is_expanded=parent_page.is_root %}
+    {% page_breadcrumbs parent_page 'wagtailadmin_explore' url_root_name='wagtailadmin_explore_root' %}
 {% endblock %}
 
 {% block actions %}

wagtail/admin/templates/wagtailadmin/shared/dropdown/dropdown.html

@@ -14,12 +14,21 @@
     - `toggle_classname` (string?) - additional toggle classes
     - `toggle_tooltip_offset` (string?) - Tooltip offset prop
     - `hide_on_click` (boolean?) - Whether or not the tooltip should hide when clicking inside
+    - `keep_mounted` (boolean?) - Whether or not the tooltip should keep its DOM node mounted when hidden
     - `children` - Dropdown contents (`a` and `button` elements only)
 {% endcomment %}
 
 {% fragment as class %}{% classnames 'w-dropdown' classname %}{% if theme %} w-dropdown--{{ theme }}{% endif %}{% endfragment %}
 
-<div data-controller="w-dropdown" {% if theme %}data-w-dropdown-theme-value="{{ theme }}"{% endif %} class="{{ class }}" {{ attrs }} {% if hide_on_click %}data-w-dropdown-hide-on-click-value="true"{% endif %}{% if toggle_tooltip_offset %} data-w-dropdown-offset-value="{{ toggle_tooltip_offset }}"{% endif %}>
+<div
+    data-controller="w-dropdown"
+    class="{{ class }}"
+    {{ attrs }}
+    {% if theme %}data-w-dropdown-theme-value="{{ theme }}"{% endif %}
+    {% if toggle_tooltip_offset %}data-w-dropdown-offset-value="{{ toggle_tooltip_offset }}"{% endif %}
+    {% if hide_on_click %}data-w-dropdown-hide-on-click-value="true"{% endif %}
+    {% if keep_mounted %}data-w-dropdown-keep-mounted-value="true"{% endif %}
+>
     <button type="button" class="{% classnames 'w-dropdown__toggle' toggle_label|yesno:',w-dropdown__toggle--icon' toggle_classname %}" data-w-dropdown-target="toggle"{% if toggle_aria_label %} aria-label="{{ toggle_aria_label }}"{% endif %}{% if toggle_describedby %} aria-describedby="{{ toggle_describedby }}"{% endif %}{% if toggle_tippy_offset %} data-tippy-offset="{{ toggle_tippy_offset }}"{% endif %}>
         {{ toggle_label }}
         {% if toggle_icon %}

wagtail/admin/templates/wagtailadmin/shared/headers/_filters.html

@@ -4,7 +4,7 @@
     <span class="w-drilldown__count" data-w-drilldown-target="count" hidden></span>
 {% endfragment %}
 
-{% dropdown theme="drilldown" toggle_icon="sliders" toggle_classname="w-filter-button" toggle_aria_label=_("Show filters") toggle_suffix=toggle_suffix %}
+{% dropdown theme="drilldown" toggle_icon="sliders" toggle_classname="w-filter-button" toggle_aria_label=_("Show filters") toggle_suffix=toggle_suffix keep_mounted=True %}
     <div class="w-drilldown__contents">
         <div class="w-drilldown__menu" data-w-drilldown-target="menu">
             <h2 class="w-help-text w-pl-5 w-py-2.5 w-my-0">{% trans "Filter by" %}</h2>

wagtail/admin/templates/wagtailadmin/shared/headers/slim_header.html

@@ -49,7 +49,7 @@
                         {% if actions or block_actions %}
                             {# Actions divider #}
                             <div class="w-w-px w-h-[30px] w-ml-auto sm:w-ml-0 w-bg-border-furniture"></div>
-                            <div class="w-flex w-items-center w-ml-3">
+                            <div id="w-slim-header-buttons" class="w-flex w-items-center w-ml-3">
                                 {% firstof actions block_actions %}
                             </div>
                         {% endif %}

wagtail/admin/templates/wagtailadmin/shared/page_breadcrumbs.html

@@ -18,33 +18,7 @@
         {% else %}
             {% url url_name page.id as breadcrumb_url %}
         {% endif %}
-        {% if page.is_root %}
-            <li
-                class="{{ breadcrumb_item_classes }} {% if forloop.last %}w-font-bold{% endif %} {% if not is_expanded %}w-max-w-0{% endif %}"
-                {% if not is_expanded %}hidden{% endif %}
-                data-w-breadcrumbs-target="content"
-            >
-                <a
-                    class="{{ breadcrumb_link_classes }}"
-                    href="{{ breadcrumb_url }}{{ querystring_value }}"
-                >
-                    {% trans "Root" %}
-                </a>
-                {% icon name="arrow-right" classname=icon_classes %}
-            </li>
-        {% elif forloop.first %}
-            {# For limited-permission users whose breadcrumb starts further down from the root #}
-            <li
-                class="{{ breadcrumb_item_classes }} {% if not is_expanded %}w-max-w-0{% endif %}"
-                {% if not is_expanded %}hidden{% endif %}
-                data-w-breadcrumbs-target="content"
-            >
-                <a class="{{ breadcrumb_link_classes }}" href="{{ breadcrumb_url }}{{ querystring_value }}">
-                    {% trans "Root" %}
-                </a>
-                {% icon name="arrow-right" classname=icon_classes %}
-            </li>
-        {% elif forloop.last %}
+        {% if forloop.last %}
             <li
                 class="{{ breadcrumb_item_classes }} w-font-bold"
                 {% if trailing_breadcrumb_title and not is_expanded %}hidden{% endif %}

wagtail/admin/templatetags/wagtailadmin_tags.py

@@ -92,10 +92,17 @@ def page_breadcrumbs(
     if not cca:
         return {"items": Page.objects.none()}
 
-    return {
-        "items": page.get_ancestors(inclusive=include_self)
+    items = (
+        page.get_ancestors(inclusive=include_self)
         .descendant_of(cca, inclusive=True)
-        .specific(),
+        .specific()
+    )
+
+    if len(items) == 1:
+        is_expanded = True
+
+    return {
+        "items": items,
         "current_page": page,
         "is_expanded": is_expanded,
         "page_perms": page_perms,

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_copy_page.py

@@ -344,8 +344,7 @@ class TestPageCopy(WagtailTestUtils, TestCase):
 
         # Check that a form error was raised
         self.assertFormError(
-            response,
-            "form",
+            response.context["form"],
             "new_slug",
             'This slug is already in use within the context of its parent page "Welcome to your new Wagtail site!"',
         )
@@ -368,8 +367,7 @@ class TestPageCopy(WagtailTestUtils, TestCase):
 
         # Check that a form error was raised
         self.assertFormError(
-            response,
-            "form",
+            response.context["form"],
             "new_parent_page",
             "You cannot copy a page into itself when copying subpages",
         )
@@ -412,8 +410,7 @@ class TestPageCopy(WagtailTestUtils, TestCase):
 
         # Check that a form error was raised
         self.assertFormError(
-            response,
-            "form",
+            response.context["form"],
             "new_slug",
             "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or hyphens.",
         )

wagtail/admin/tests/pages/test_create_page.py

@@ -517,14 +517,12 @@ class TestPageCreation(WagtailTestUtils, TestCase):
 
         # Check that a form error was raised
         self.assertFormError(
-            response,
-            "form",
+            response.context["form"],
             "go_live_at",
             "Go live date/time must be before expiry date/time",
         )
         self.assertFormError(
-            response,
-            "form",
+            response.context["form"],
             "expire_at",
             "Go live date/time must be before expiry date/time",
         )
@@ -567,7 +565,9 @@ class TestPageCreation(WagtailTestUtils, TestCase):
 
         # Check that a form error was raised
         self.assertFormError(
-            response, "form", "expire_at", "Expiry date/time must be in the future"
+            response.context["form"],
+            "expire_at",
+            "Expiry date/time must be in the future",
         )
 
         self.assertContains(
@@ -749,8 +749,7 @@ class TestPageCreation(WagtailTestUtils, TestCase):
 
         # Check that a form error was raised
         self.assertFormError(
-            response,
-            "form",
+            response.context["form"],
             "slug",
             "The slug 'hello-world' is already in use within the parent page",
         )
@@ -787,7 +786,7 @@ class TestPageCreation(WagtailTestUtils, TestCase):
         )
 
         self.assertEqual(response.status_code, 200)
-        self.assertFormError(response, "form", "foo", "Field foo must be bar")
+        self.assertFormError(response.context["form"], "foo", "Field foo must be bar")
         self.assertFalse(
             Page.objects.filter(
                 path__startswith=self.root_page.path, slug="hello-world"
@@ -911,7 +910,9 @@ class TestPageCreation(WagtailTestUtils, TestCase):
         )
 
         # Check that a form error was raised
-        self.assertFormError(response, "form", "title", "This field is required.")
+        self.assertFormError(
+            response.context["form"], "title", "This field is required."
+        )
 
     def test_whitespace_titles_with_tab(self):
         post_data = {
@@ -929,7 +930,9 @@ class TestPageCreation(WagtailTestUtils, TestCase):
         )
 
         # Check that a form error was raised
-        self.assertFormError(response, "form", "title", "This field is required.")
+        self.assertFormError(
+            response.context["form"], "title", "This field is required."
+        )
 
     def test_whitespace_titles_with_tab_in_seo_title(self):
         post_data = {
@@ -1000,8 +1003,7 @@ class TestPageCreation(WagtailTestUtils, TestCase):
         # Check that a form error was raised
         self.assertEqual(response.status_code, 200)
         self.assertFormError(
-            response,
-            "form",
+            response.context["form"],
             "slug",
             "Ensure this value has at most 255 characters (it has 287).",
         )

wagtail/admin/tests/pages/test_edit_page.py

@@ -681,14 +681,12 @@ class TestPageEdit(WagtailTestUtils, TestCase):
 
         # Check that a form error was raised
         self.assertFormError(
-            response,
-            "form",
+            response.context["form"],
             "go_live_at",
             "Go live date/time must be before expiry date/time",
         )
         self.assertFormError(
-            response,
-            "form",
+            response.context["form"],
             "expire_at",
             "Go live date/time must be before expiry date/time",
         )
@@ -727,7 +725,9 @@ class TestPageEdit(WagtailTestUtils, TestCase):
 
         # Check that a form error was raised
         self.assertFormError(
-            response, "form", "expire_at", "Expiry date/time must be in the future"
+            response.context["form"],
+            "expire_at",
+            "Expiry date/time must be in the future",
         )
 
         self.assertContains(
@@ -1591,8 +1591,7 @@ class TestPageEdit(WagtailTestUtils, TestCase):
 
         # Check that a form error was raised
         self.assertFormError(
-            response,
-            "form",
+            response.context["form"],
             "slug",
             "The slug 'hello-world' is already in use within the parent page",
         )

wagtail/admin/tests/pages/test_explorer_view.py

@@ -1140,7 +1140,7 @@ class TestExplorablePageVisibility(WagtailTestUtils, TestCase):
         expected = """
             <li class="w-h-full w-flex w-items-center w-overflow-hidden w-transition w-duration-300 w-whitespace-nowrap w-flex-shrink-0 w-max-w-0" data-w-breadcrumbs-target="content" hidden>
                 <a class="w-flex w-items-center w-text-text-label w-pr-0.5 w-text-14 w-no-underline w-outline-offset-inside w-border-b w-border-b-2 w-border-transparent w-box-content hover:w-border-current hover:w-text-text-label" href="/admin/pages/4/">
-                    Root
+                    Welcome to example.com!
                 </a>
                 <svg class="icon icon-arrow-right w-w-4 w-h-4 w-ml-3" aria-hidden="true">
                     <use href="#icon-arrow-right"></use>
@@ -1159,8 +1159,22 @@ class TestExplorablePageVisibility(WagtailTestUtils, TestCase):
             </li>
         """
         self.assertContains(response, expected, html=True)
-        # The page title shouldn't appear because it's the "home" breadcrumb.
-        self.assertNotContains(response, "Welcome to example.com!")
+
+    def test_nonadmin_sees_non_hidden_root(self):
+        self.login(username="josh", password="password")
+        response = self.client.get(reverse("wagtailadmin_explore", args=[4]))
+        self.assertEqual(response.status_code, 200)
+        # When Josh is viewing his visible root page, he should the page title as a non-hidden, single-item breadcrumb.
+        expected = """
+            <li
+                class="w-h-full w-flex w-items-center w-overflow-hidden w-transition w-duration-300 w-whitespace-nowrap w-flex-shrink-0 w-font-bold" data-w-breadcrumbs-target="content">
+                <a class="w-flex w-items-center w-text-text-label w-pr-0.5 w-text-14 w-no-underline w-outline-offset-inside w-border-b w-border-b-2 w-border-transparent w-box-content hover:w-border-current hover:w-text-text-label"
+                   href="/admin/pages/4/">
+                    Welcome to example.com!
+                </a>
+            </li>
+        """
+        self.assertContains(response, expected, html=True)
 
     def test_admin_home_page_changes_with_permissions(self):
         self.login(username="bob", password="password")

wagtail/admin/tests/test_privacy.py

@@ -172,7 +172,9 @@ class TestSetPrivacyView(WagtailTestUtils, TestCase):
         self.assertEqual(response.status_code, 200)
 
         # Check that a form error was raised
-        self.assertFormError(response, "form", "password", "This field is required.")
+        self.assertFormError(
+            response.context["form"], "password", "This field is required."
+        )
 
     def test_unset_password_restriction(self):
         """
@@ -287,7 +289,7 @@ class TestSetPrivacyView(WagtailTestUtils, TestCase):
 
         # Check that a form error was raised
         self.assertFormError(
-            response, "form", "groups", "Please select at least one group."
+            response.context["form"], "groups", "Please select at least one group."
         )
 
     def test_unset_group_restriction(self):

wagtail/admin/tests/test_workflows.py

@@ -374,9 +374,8 @@ class TestWorkflowsCreateView(AdminTemplateTestUtils, WagtailTestUtils, TestCase
         )
 
         self.assertEqual(response.status_code, 200)
-        self.assertFormsetError(
-            response,
-            "pages_formset",
+        self.assertFormSetError(
+            response.context["pages_formset"],
             0,
             "page",
             ["This page already has workflow 'existing_workflow' assigned."],
@@ -606,9 +605,8 @@ class TestWorkflowsEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         )
 
         self.assertEqual(response.status_code, 200)
-        self.assertFormsetError(
-            response,
-            "pages_formset",
+        self.assertFormSetError(
+            response.context["pages_formset"],
             None,
             None,
             ["You cannot assign this workflow to the same page multiple times."],
@@ -2460,7 +2458,7 @@ class TestPageWorkflowReport(BasePageWorkflowTests):
         self.submitter.first_name = "Sebastian"
         self.submitter.last_name = "Mitter"
         self.submitter.save()
-        self.post("submit")
+        self.post("submit", follow=True)
         self.login(user=self.moderator)
 
     def setup_workflow_and_tasks(self):
@@ -2593,11 +2591,35 @@ class TestPageWorkflowReport(BasePageWorkflowTests):
                 self.assertEqual(response.status_code, 200)
                 self.assertNotIn("Hello world!", content)
 
+    def test_workflow_report_deleted(self):
+        self.object.delete()
+        response = self.client.get(reverse("wagtailadmin_reports:workflow"))
+        self.assertEqual(response.status_code, 200)
+        self.assertNotContains(response, "Hello world!")
+        # test_workflow is only rendered in the filter, not the results
+        self.assertContains(response, "test_workflow", count=1)
+        self.assertNotContains(response, "Sebastian Mitter")
+        self.assertNotContains(response, "March 31, 2020")
+
+        response = self.client.get(reverse("wagtailadmin_reports:workflow_tasks"))
+        self.assertEqual(response.status_code, 200)
+        self.assertNotContains(response, "Hello world!")
+
 
 class TestSnippetWorkflowReport(TestPageWorkflowReport, BaseSnippetWorkflowTests):
     pass
 
 
+class TestNonLockableSnippetWorkflowReport(
+    TestPageWorkflowReport, BaseSnippetWorkflowTests
+):
+    # This model does not use LockableMixin, and it also does not have a
+    # GenericRelation to WorkflowState and Revision, but it should not break
+    # the report page.
+    # See https://github.com/wagtail/wagtail/issues/11300 for more details.
+    model = ModeratedModel
+
+
 class TestPageNotificationPreferences(BasePageWorkflowTests):
     def setUp(self):
         super().setUp()