wagtail 6.2.3__py3-none-any.whl → 6.3__py3-none-any.whl

wagtail/contrib/forms/tests/test_views.py

@@ -3,6 +3,7 @@ from io import BytesIO
 
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
+from django.contrib.contenttypes.models import ContentType
 from django.test import RequestFactory, TestCase, override_settings
 from django.urls import reverse
 from django.utils.html import escape
@@ -17,7 +18,9 @@ from wagtail.contrib.forms.tests.utils import (
     make_form_page,
     make_form_page_with_custom_submission,
 )
+from wagtail.contrib.forms.utils import get_form_types
 from wagtail.models import Locale, Page
+from wagtail.test.demosite.models import FormPage as FormPageDemo
 from wagtail.test.testapp.models import (
     CustomFormPageSubmission,
     ExtendedFormField,
@@ -28,6 +31,8 @@ from wagtail.test.testapp.models import (
     FormPageWithCustomFormBuilder,
     FormPageWithCustomSubmission,
     FormPageWithCustomSubmissionListView,
+    FormPageWithRedirect,
+    JadeFormPage,
 )
 from wagtail.test.utils import WagtailTestUtils
 from wagtail.test.utils.form_data import inline_formset, nested_form_data
@@ -154,16 +159,35 @@ class TestFormsIndex(WagtailTestUtils, TestCase):
 
     def setUp(self):
         self.login(username="siteeditor", password="password")
-        self.form_page = Page.objects.get(url_path="/home/contact-us/")
+        get_form_types.cache_clear()
+
+    @classmethod
+    def setUpTestData(cls):
+        cls.form_page = Page.objects.specific().get(url_path="/home/contact-us/")
+        # Save a revision so latest_revision_created_at is populated, and thus
+        # the form page is always shown first when using the default ordering
+        # (latest_revision_created_at descending).
+        cls.form_page.save_revision()
+        cls.models = [
+            FormPage,
+            FormPageWithRedirect,
+            FormPageWithCustomFormBuilder,
+            FormPageWithCustomSubmission,
+            FormPageWithCustomSubmissionListView,
+            JadeFormPage,
+            FormPageDemo,
+        ]
+        cls.make_form_pages()
 
-    def make_form_pages(self):
+    @classmethod
+    def make_form_pages(cls):
         """
         This makes 100 form pages and adds them as children to 'contact-us'
         This is used to test pagination on the forms index
         """
         for i in range(100):
-            self.form_page.add_child(
-                instance=FormPage(
+            cls.form_page.add_child(
+                instance=cls.models[i % len(cls.models)](
                     title="Form " + str(i), slug="form-" + str(i), live=True
                 )
             )
@@ -176,9 +200,6 @@ class TestFormsIndex(WagtailTestUtils, TestCase):
         self.assertTemplateUsed(response, "wagtailforms/index.html")
 
     def test_forms_index_pagination(self):
-        # Create some more form pages to make pagination kick in
-        self.make_form_pages()
-
         # Get page two
         response = self.client.get(reverse("wagtailforms:index"), {"p": 2})
 
@@ -190,39 +211,51 @@ class TestFormsIndex(WagtailTestUtils, TestCase):
         self.assertEqual(response.context["page_obj"].number, 2)
 
     def test_forms_index_pagination_invalid(self):
-        # Create some more form pages to make pagination kick in
-        self.make_form_pages()
-
         # Get page two
         response = self.client.get(reverse("wagtailforms:index"), {"p": "Hello world!"})
 
         # Check response
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailforms/index.html")
 
-    def test_forms_index_pagination_out_of_range(self):
-        # Create some more form pages to make pagination kick in
-        self.make_form_pages()
+        # Check that it got page one
+        self.assertEqual(response.context["page_obj"].number, 1)
 
-        # Get page two
+    def test_forms_index_pagination_out_of_range(self):
+        # Get page that is out of range
         response = self.client.get(reverse("wagtailforms:index"), {"p": 99999})
 
         # Check response
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailforms/index.html")
+
+        # Check that it got the last page
+        self.assertEqual(
+            response.context["page_obj"].number, response.context["paginator"].num_pages
+        )
 
     def test_cannot_see_forms_without_permission(self):
+        self.login(username="admin_only_user", password="password")
+        response = self.client.get(reverse("wagtailforms:index"))
+        self.assertRedirects(response, reverse("wagtailadmin_home"))
+
         # Login with as a user without permission to see forms
         self.login(username="eventeditor", password="password")
 
         response = self.client.get(reverse("wagtailforms:index"))
+        self.assertEqual(response.status_code, 200)
 
         # Check that the user cannot see the form page
         self.assertNotIn(self.form_page, response.context["form_pages"])
+        self.assertEqual(len(response.context["form_pages"]), 0)
 
     def test_can_see_forms_with_permission(self):
         response = self.client.get(reverse("wagtailforms:index"))
+        self.assertEqual(response.status_code, 200)
 
         # Check that the user can see the form page
         self.assertIn(self.form_page, response.context["form_pages"])
+        self.assertEqual(len(response.context["form_pages"]), 20)
 
     def test_cant_see_forms_after_filter_form_submissions_for_user_hook(self):
         # Hook allows to see forms only to superusers
@@ -236,6 +269,7 @@ class TestFormsIndex(WagtailTestUtils, TestCase):
 
         # Check that an user can see the form page
         self.assertIn(self.form_page, response.context["form_pages"])
+        self.assertEqual(len(response.context["form_pages"]), 20)
 
         with self.register_hook(
             "filter_form_submissions_for_user", construct_forms_for_user
@@ -244,6 +278,65 @@ class TestFormsIndex(WagtailTestUtils, TestCase):
 
         # Check that an user can't see the form page
         self.assertNotIn(self.form_page, response.context["form_pages"])
+        self.assertEqual(len(response.context["form_pages"]), 0)
+
+    def test_search(self):
+        response = self.client.get(reverse("wagtailforms:index"), {"q": "Form 10"})
+
+        self.assertNotIn(self.form_page, response.context["form_pages"])
+        self.assertCountEqual(
+            [page.title for page in response.context["form_pages"]],
+            ["Form 10"],
+        )
+
+    def test_filter_by_page_type(self):
+        content_type_ids = [
+            ct.pk
+            for ct in ContentType.objects.get_for_models(
+                FormPageWithRedirect, FormPageDemo
+            ).values()
+        ]
+        response = self.client.get(
+            reverse("wagtailforms:index"),
+            {"content_type": content_type_ids},
+        )
+
+        soup = self.get_soup(response.content)
+        inputs = soup.select('input[name="content_type"]')
+        self.assertCountEqual(
+            [int(input.attrs.get("value")) for input in inputs],
+            [ct.pk for ct in ContentType.objects.get_for_models(*self.models).values()],
+        )
+        selected_cts = soup.select('input[name="content_type"][checked]')
+        self.assertEqual(len(selected_cts), 2)
+        self.assertCountEqual(
+            [int(input.attrs.get("value")) for input in selected_cts],
+            content_type_ids,
+        )
+
+        # Check that only pages of the selected types are shown
+        self.assertNotIn(self.form_page, response.context["form_pages"])
+        self.assertEqual(
+            {page.__class__ for page in response.context["form_pages"]},
+            {FormPageWithRedirect, FormPageDemo},
+        )
+
+    def test_search_and_filter(self):
+        response = self.client.get(
+            reverse("wagtailforms:index"),
+            {
+                "q": "Contact",
+                "content_type": ContentType.objects.get_for_model(FormPage).pk,
+            },
+        )
+
+        self.assertIn(self.form_page, response.context["form_pages"])
+        # The "Contact us one more time" page from the fixtures is not included
+        # because it's a FormPageWithCustomSubmission, not a FormPage
+        self.assertCountEqual(
+            [page.title for page in response.context["form_pages"]],
+            ["Contact us"],
+        )
 
 
 @override_settings(WAGTAIL_I18N_ENABLED=True)
@@ -319,7 +412,15 @@ class TestFormsIndexWithLocalisationEnabled(WagtailTestUtils, TestCase):
         self.assertEqual(len(response.context["page_obj"].object_list), 3)
 
         response = self.client.get(self.forms_index_url, {"p": 4})
-        self.assertEqual(response.status_code, 404)
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailforms/index.html")
+
+        # Check that we got the last page
+        self.assertEqual(
+            response.context["page_obj"].number,
+            response.context["paginator"].num_pages,
+        )
 
         # now check the French pages.
         response = self.client.get(
@@ -331,8 +432,9 @@ class TestFormsIndexWithLocalisationEnabled(WagtailTestUtils, TestCase):
     @override_settings(WAGTAIL_I18N_ENABLED=False)
     def test_switcher_doesnt_show_with_i18n_disabled(self):
         response = self.client.get(self.forms_index_url)
-
-        self.assertNotContains(response, "data-locale-selector")
+        soup = self.get_soup(response.content)
+        inputs = soup.select('input[name="locale"]')
+        self.assertEqual(len(inputs), 0)
 
 
 class TestFormsSubmissionsList(WagtailTestUtils, TestCase):
@@ -463,10 +565,8 @@ class TestFormsSubmissionsList(WagtailTestUtils, TestCase):
     def test_list_submissions_pagination(self):
         self.make_list_submissions()
 
-        response = self.client.get(
-            reverse("wagtailforms:list_submissions", args=(self.form_page.id,)),
-            {"p": 2},
-        )
+        list_url = reverse("wagtailforms:list_submissions", args=(self.form_page.id,))
+        response = self.client.get(list_url, {"p": 2})
 
         # Check response
         self.assertEqual(response.status_code, 200)
@@ -475,6 +575,18 @@ class TestFormsSubmissionsList(WagtailTestUtils, TestCase):
         # Check that we got the correct page
         self.assertEqual(response.context["page_obj"].number, 2)
 
+        # The delete form should have a 'next' input that points back to the list page
+        # with the same pagination querystring
+        soup = self.get_soup(response.content)
+        delete_url = reverse(
+            "wagtailforms:delete_submissions", args=(self.form_page.id,)
+        )
+        form = soup.find("form", {"action": delete_url})
+        self.assertIsNotNone(form)
+        next_input = form.find("input", {"name": "next"})
+        self.assertIsNotNone(next_input)
+        self.assertEqual(next_input.get("value"), f"{list_url}?p=2")
+
     def test_list_submissions_pagination_invalid(self):
         self.make_list_submissions()
 
@@ -484,7 +596,11 @@ class TestFormsSubmissionsList(WagtailTestUtils, TestCase):
         )
 
         # Check response
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailforms/submissions_index.html")
+
+        # Check that we got page one
+        self.assertEqual(response.context["page_obj"].number, 1)
 
     def test_list_submissions_pagination_out_of_range(self):
         self.make_list_submissions()
@@ -495,7 +611,13 @@ class TestFormsSubmissionsList(WagtailTestUtils, TestCase):
         )
 
         # Check response
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailforms/submissions_index.html")
+
+        # Check that we got the last page
+        self.assertEqual(
+            response.context["page_obj"].number, response.context["paginator"].num_pages
+        )
 
     def test_list_submissions_default_order(self):
         response = self.client.get(
@@ -1156,10 +1278,8 @@ class TestCustomFormsSubmissionsList(WagtailTestUtils, TestCase):
     def test_list_submissions_pagination(self):
         self.make_list_submissions()
 
-        response = self.client.get(
-            reverse("wagtailforms:list_submissions", args=(self.form_page.id,)),
-            {"p": 2},
-        )
+        list_url = reverse("wagtailforms:list_submissions", args=(self.form_page.id,))
+        response = self.client.get(list_url, {"p": 2})
 
         # Check response
         self.assertEqual(response.status_code, 200)
@@ -1174,6 +1294,18 @@ class TestCustomFormsSubmissionsList(WagtailTestUtils, TestCase):
         )
         self.assertContains(response, "generated-username-", count=20)
 
+        # The delete form should have a 'next' input that points back to the list page
+        # with the same pagination querystring
+        soup = self.get_soup(response.content)
+        delete_url = reverse(
+            "wagtailforms:delete_submissions", args=(self.form_page.id,)
+        )
+        form = soup.find("form", {"action": delete_url})
+        self.assertIsNotNone(form)
+        next_input = form.find("input", {"name": "next"})
+        self.assertIsNotNone(next_input)
+        self.assertEqual(next_input.get("value"), f"{list_url}?p=2")
+
     def test_list_submissions_pagination_invalid(self):
         self.make_list_submissions()
 
@@ -1183,7 +1315,11 @@ class TestCustomFormsSubmissionsList(WagtailTestUtils, TestCase):
         )
 
         # Check response
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailforms/submissions_index.html")
+
+        # Check that we got page one
+        self.assertEqual(response.context["page_obj"].number, 1)
 
     def test_list_submissions_pagination_out_of_range(self):
         self.make_list_submissions()
@@ -1194,7 +1330,13 @@ class TestCustomFormsSubmissionsList(WagtailTestUtils, TestCase):
         )
 
         # Check response
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailforms/submissions_index.html")
+
+        # Check that we got the last page
+        self.assertEqual(
+            response.context["page_obj"].number, response.context["paginator"].num_pages
+        )
 
 
 class TestDeleteFormSubmission(WagtailTestUtils, TestCase):
@@ -1205,16 +1347,30 @@ class TestDeleteFormSubmission(WagtailTestUtils, TestCase):
         self.form_page = Page.objects.get(url_path="/home/contact-us/")
 
     def test_delete_submission_show_confirmation(self):
+        delete_url = reverse(
+            "wagtailforms:delete_submissions", args=(self.form_page.id,)
+        )
+        list_url = reverse("wagtailforms:list_submissions", args=(self.form_page.id,))
+
         response = self.client.get(
             reverse("wagtailforms:delete_submissions", args=(self.form_page.id,))
             + f"?selected-submissions={FormSubmission.objects.first().id}"
         )
+        self.assertEqual(response.status_code, 200)
         # Check show confirm page when HTTP method is GET
         self.assertTemplateUsed(response, "wagtailforms/confirm_delete.html")
 
         # Check that the deletion has not happened with GET request
         self.assertEqual(FormSubmission.objects.count(), 2)
 
+        # The delete form should have a 'next' input that points back to the list page
+        soup = self.get_soup(response.content)
+        form = soup.select_one(f'form[action^="{delete_url}"]')
+        self.assertIsNotNone(form)
+        next_input = form.find("input", {"name": "next"})
+        self.assertIsNotNone(next_input)
+        self.assertEqual(next_input.get("value"), list_url)
+
     def test_delete_submission_with_permissions(self):
         response = self.client.post(
             reverse("wagtailforms:delete_submissions", args=(self.form_page.id,))
@@ -1289,6 +1445,39 @@ class TestDeleteFormSubmission(WagtailTestUtils, TestCase):
             reverse("wagtailforms:list_submissions", args=(self.form_page.id,)),
         )
 
+    def test_delete_submission_with_next_url(self):
+        submission_id = FormSubmission.objects.first().id
+        delete_url = reverse(
+            "wagtailforms:delete_submissions", args=(self.form_page.id,)
+        )
+        list_url = reverse("wagtailforms:list_submissions", args=(self.form_page.id,))
+        next_url = list_url + "?p=2"
+
+        response = self.client.get(
+            reverse("wagtailforms:delete_submissions", args=(self.form_page.id,))
+            + f"?selected-submissions={submission_id}&next={next_url}"
+        )
+        self.assertEqual(response.status_code, 200)
+
+        # The delete form should have a 'next' input that points back to the list page
+        # with the same pagination querystring
+        soup = self.get_soup(response.content)
+        form = soup.select_one(f'form[action^="{delete_url}"]')
+        self.assertIsNotNone(form)
+        next_input = form.find("input", {"name": "next"})
+        self.assertIsNotNone(next_input)
+        self.assertEqual(next_input.get("value"), next_url)
+
+        # Submitting the form should redirect to the next URL
+        response = self.client.post(
+            reverse("wagtailforms:delete_submissions", args=(self.form_page.id,)),
+            {
+                "selected-submissions": submission_id,
+                "next": next_url,
+            },
+        )
+        self.assertRedirects(response, next_url)
+
 
 class TestDeleteCustomFormSubmission(WagtailTestUtils, TestCase):
     fixtures = ["test.json"]
@@ -1483,10 +1672,8 @@ class TestFormsWithCustomSubmissionsList(WagtailTestUtils, TestCase):
     def test_list_submissions_pagination(self):
         self.make_list_submissions()
 
-        response = self.client.get(
-            reverse("wagtailforms:list_submissions", args=(self.form_page.id,)),
-            {"p": 2},
-        )
+        list_url = reverse("wagtailforms:list_submissions", args=(self.form_page.id,))
+        response = self.client.get(list_url, {"p": 2})
 
         # Check response
         self.assertEqual(response.status_code, 200)
@@ -1497,6 +1684,18 @@ class TestFormsWithCustomSubmissionsList(WagtailTestUtils, TestCase):
         self.assertContains(response, "Wet my pants excited!", count=50)
         self.assertEqual(response.context["page_obj"].number, 2)
 
+        # The delete form should have a 'next' input that points back to the list page
+        # with the same pagination querystring
+        soup = self.get_soup(response.content)
+        delete_url = reverse(
+            "wagtailforms:delete_submissions", args=(self.form_page.id,)
+        )
+        form = soup.find("form", {"action": delete_url})
+        self.assertIsNotNone(form)
+        next_input = form.find("input", {"name": "next"})
+        self.assertIsNotNone(next_input)
+        self.assertEqual(next_input.get("value"), f"{list_url}?p=2")
+
     def test_list_submissions_csv_export(self):
         response = self.client.get(
             reverse("wagtailforms:list_submissions", args=(self.form_page.id,)),

wagtail/contrib/forms/utils.py

@@ -1,3 +1,5 @@
+from functools import lru_cache
+
 from django.contrib.contenttypes.models import ContentType
 
 from wagtail import hooks
@@ -5,8 +7,6 @@ from wagtail.coreutils import safe_snake_case
 from wagtail.models import get_page_models
 from wagtail.permissions import page_permission_policy
 
-_FORM_CONTENT_TYPES = None
-
 
 def get_field_clean_name(label):
     """
@@ -16,19 +16,13 @@ def get_field_clean_name(label):
     return safe_snake_case(label)
 
 
+@lru_cache(maxsize=None)
 def get_form_types():
-    global _FORM_CONTENT_TYPES
-    if _FORM_CONTENT_TYPES is None:
-        from wagtail.contrib.forms.models import FormMixin
-
-        form_models = [
-            model for model in get_page_models() if issubclass(model, FormMixin)
-        ]
-
-        _FORM_CONTENT_TYPES = list(
-            ContentType.objects.get_for_models(*form_models).values()
-        )
-    return _FORM_CONTENT_TYPES
+    from wagtail.contrib.forms.models import FormMixin
+
+    form_models = [model for model in get_page_models() if issubclass(model, FormMixin)]
+
+    return list(ContentType.objects.get_for_models(*form_models).values())
 
 
 def get_forms_for_user(user):

wagtail/contrib/forms/views.py

@@ -2,21 +2,31 @@ import datetime
 from collections import OrderedDict
 
 from django.contrib.admin.utils import quote
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
+from django.forms import CheckboxSelectMultiple
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
+from django.utils.functional import classproperty
 from django.utils.translation import gettext, gettext_lazy, ngettext
 from django.views.generic import TemplateView
 from django_filters import DateFromToRangeFilter
 
 from wagtail.admin import messages
-from wagtail.admin.filters import DateRangePickerWidget, WagtailFilterSet
+from wagtail.admin.filters import (
+    DateRangePickerWidget,
+    MultipleContentTypeFilter,
+    WagtailFilterSet,
+)
 from wagtail.admin.ui.tables import Column, TitleColumn
-from wagtail.admin.views import generic
+from wagtail.admin.utils import get_valid_next_url_from_request
+from wagtail.admin.views.generic import PermissionCheckedMixin
 from wagtail.admin.views.generic.base import BaseListingView
 from wagtail.admin.views.mixins import SpreadsheetExportMixin
-from wagtail.contrib.forms.utils import get_forms_for_user
+from wagtail.admin.views.pages.listing import PageFilterSet, PageListingMixin
+from wagtail.contrib.forms.utils import get_form_types, get_forms_for_user
 from wagtail.models import Page
+from wagtail.permissions import page_permission_policy
 
 
 def get_submissions_list_view(request, *args, **kwargs):
@@ -39,9 +49,28 @@ class ContentTypeColumn(Column):
         return context
 
 
-class FormPagesListView(generic.IndexView):
+class FormPageFilterSet(PageFilterSet):
+    content_type = MultipleContentTypeFilter(
+        label=gettext_lazy("Page type"),
+        queryset=lambda request: ContentType.objects.filter(
+            pk__in=[ct.pk for ct in get_form_types()]
+        ).order_by("model"),
+        widget=CheckboxSelectMultiple,
+    )
+
+
+class FormPagesListView(PageListingMixin, PermissionCheckedMixin, BaseListingView):
     """Lists the available form pages for the current user"""
 
+    permission_policy = page_permission_policy
+    any_permission_required = {
+        "add",
+        "change",
+        "publish",
+        "bulk_delete",
+        "lock",
+        "unlock",
+    }
     template_name = "wagtailforms/index.html"
     results_template_name = "wagtailforms/index_results.html"
     context_object_name = "form_pages"
@@ -51,25 +80,36 @@ class FormPagesListView(generic.IndexView):
     index_results_url_name = "wagtailforms:index_results"
     page_title = gettext_lazy("Forms")
     header_icon = "form"
-    _show_breadcrumbs = True
-    columns = [
-        TitleColumn(
-            "title",
-            classname="title",
-            label=gettext_lazy("Title"),
-            width="50%",
-            url_name="wagtailforms:list_submissions",
-            sort_key="title",
-        ),
-        ContentTypeColumn(
-            "content_type",
-            label=gettext_lazy("Origin"),
-            width="50%",
-            sort_key="content_type",
-        ),
-    ]
     model = Page
-    is_searchable = False
+    is_searchable = True
+    filterset_class = FormPageFilterSet
+
+    @classproperty
+    def columns(self):
+        columns = [
+            col for col in PageListingMixin.columns if col.name not in {"title", "type"}
+        ]
+        columns.insert(
+            1,
+            TitleColumn(
+                "title",
+                classname="title",
+                label=gettext_lazy("Title"),
+                url_name="wagtailforms:list_submissions",
+                sort_key="title",
+                width="30%",
+            ),
+        )
+        columns.insert(
+            -1,
+            ContentTypeColumn(
+                "content_type",
+                label=gettext_lazy("Origin"),
+                sort_key="content_type",
+                width="20%",
+            ),
+        )
+        return columns
 
     def get_breadcrumbs_items(self):
         return self.breadcrumbs_items + [
@@ -78,7 +118,8 @@ class FormPagesListView(generic.IndexView):
 
     def get_base_queryset(self):
         """Return the queryset of form pages for this view"""
-        return get_forms_for_user(self.request.user).select_related("content_type")
+        pages = get_forms_for_user(self.request.user).select_related("content_type")
+        return self.annotate_queryset(pages)
 
 
 class DeleteSubmissionsView(TemplateView):
@@ -87,7 +128,7 @@ class DeleteSubmissionsView(TemplateView):
     template_name = "wagtailforms/confirm_delete.html"
     page = None
     submissions = None
-    success_url = "wagtailforms:list_submissions"
+    success_url_name = "wagtailforms:list_submissions"
 
     def get_queryset(self):
         """Returns a queryset for the selected submissions"""
@@ -111,7 +152,10 @@ class DeleteSubmissionsView(TemplateView):
 
     def get_success_url(self):
         """Returns the success URL to redirect to after a successful deletion"""
-        return self.success_url
+        next_url = get_valid_next_url_from_request(self.request)
+        if next_url:
+            return next_url
+        return reverse(self.success_url_name, args=(self.page.id,))
 
     def dispatch(self, request, *args, **kwargs):
         """Check permissions, set the page and submissions, handle delete"""
@@ -126,7 +170,7 @@ class DeleteSubmissionsView(TemplateView):
 
         if self.request.method == "POST":
             self.handle_delete(self.submissions)
-            return redirect(self.get_success_url(), page_id)
+            return redirect(self.get_success_url())
 
         return super().dispatch(request, *args, **kwargs)
 
@@ -140,6 +184,7 @@ class DeleteSubmissionsView(TemplateView):
                 "submissions": self.submissions,
             }
         )
+        context["next_url"] = self.get_success_url()
 
         return context
 
@@ -172,7 +217,6 @@ class SubmissionsListView(SpreadsheetExportMixin, BaseListingView):
     forms_index_url_name = "wagtailforms:index"
     index_url_name = "wagtailforms:list_submissions"
     index_results_url_name = "wagtailforms:list_submissions_results"
-    _show_breadcrumbs = True
     show_export_buttons = True
 
     def dispatch(self, request, *args, **kwargs):
@@ -319,4 +363,5 @@ class SubmissionsListView(SpreadsheetExportMixin, BaseListingView):
                 }
             )
 
+        context["next_url"] = self.request.get_full_path()
         return context

wagtail/contrib/frontend_cache/backends/azure.py

@@ -100,7 +100,7 @@ class AzureBaseBackend(BaseBackend):
         return {
             "resource_group_name": self._resource_group_name,
             "custom_headers": self._custom_headers,
-            "content_paths": paths,
+            "content_paths": set(paths),
         }
 
     def _purge_content(self, paths):