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

wagtail/admin/views/generic/models.py

@@ -479,7 +479,7 @@ class CreateView(
             {
                 "url": "",
                 "label": _("New: %(model_name)s")
-                % {"model_name": capfirst(self.model._meta.verbose_name)},
+                % {"model_name": self.get_page_subtitle()},
             }
         )
         return self.breadcrumbs_items + items
@@ -677,6 +677,16 @@ class EditView(
         super().setup(request, *args, **kwargs)
         self.action = self.get_action(request)
 
+    @cached_property
+    def object_pk(self):
+        # Must be a cached_property to prevent this from being re-run on the unquoted
+        # pk written back by get_object, which would result in it being unquoted again.
+        try:
+            quoted_pk = self.kwargs[self.pk_url_kwarg]
+        except KeyError:
+            quoted_pk = self.args[0]
+        return unquote(str(quoted_pk))
+
     def get_action(self, request):
         for action in self.get_available_actions():
             if request.POST.get(f"action-{action}"):
@@ -687,9 +697,9 @@ class EditView(
         return self.actions
 
     def get_object(self, queryset=None):
-        if self.pk_url_kwarg not in self.kwargs:
-            self.kwargs[self.pk_url_kwarg] = self.args[0]
-        self.kwargs[self.pk_url_kwarg] = unquote(str(self.kwargs[self.pk_url_kwarg]))
+        # SingleObjectMixin.get_object looks for the unquoted pk in self.kwargs,
+        # so we need to write it back there.
+        self.kwargs[self.pk_url_kwarg] = self.object_pk
         return super().get_object(queryset)
 
     def get_page_subtitle(self):
@@ -947,9 +957,15 @@ class DeleteView(
         # If the object has already been loaded, return it to avoid another query
         if getattr(self, "object", None):
             return self.object
-        if self.pk_url_kwarg not in self.kwargs:
-            self.kwargs[self.pk_url_kwarg] = self.args[0]
-        self.kwargs[self.pk_url_kwarg] = unquote(str(self.kwargs[self.pk_url_kwarg]))
+
+        # SingleObjectMixin.get_object looks for the unquoted pk in self.kwargs,
+        # so we need to write it back there.
+        try:
+            quoted_pk = self.kwargs[self.pk_url_kwarg]
+        except KeyError:
+            quoted_pk = self.args[0]
+        self.kwargs[self.pk_url_kwarg] = unquote(str(quoted_pk))
+
         return super().get_object(queryset)
 
     def get_usage(self):
@@ -1167,13 +1183,47 @@ class InspectView(PermissionCheckedMixin, WagtailAdminTemplateMixin, TemplateVie
 
 class RevisionsCompareView(WagtailAdminTemplateMixin, TemplateView):
     edit_handler = None
+    index_url_name = None
     edit_url_name = None
     history_url_name = None
     edit_label = gettext_lazy("Edit")
     history_label = gettext_lazy("History")
+    page_title = gettext_lazy("Compare")
     template_name = "wagtailadmin/generic/revisions/compare.html"
+    _show_breadcrumbs = True
     model = None
 
+    def get_breadcrumbs_items(self):
+        items = []
+        if (index_url := self.get_index_url()) and self.model:
+            items.append(
+                {
+                    "url": index_url,
+                    "label": capfirst(self.model._meta.verbose_name_plural),
+                }
+            )
+        if edit_url := self.get_edit_url():
+            items.append({"url": edit_url, "label": self.get_page_subtitle()})
+        if history_url := self.get_history_url():
+            items.append({"url": history_url, "label": self.history_label})
+        items.append(
+            {
+                "url": "",
+                "label": self.get_page_title(),
+                "sublabel": self.get_page_subtitle(),
+            }
+        )
+        return self.breadcrumbs_items + items
+
+    @cached_property
+    def header_buttons(self):
+        buttons = []
+        if edit_url := self.get_edit_url():
+            buttons.append(
+                HeaderButton(self.edit_label, url=edit_url, icon_name="edit")
+            )
+        return buttons
+
     def setup(self, request, pk, revision_id_a, revision_id_b, *args, **kwargs):
         super().setup(request, *args, **kwargs)
         self.pk = pk
@@ -1192,6 +1242,10 @@ class RevisionsCompareView(WagtailAdminTemplateMixin, TemplateView):
     def get_page_subtitle(self):
         return str(self.object)
 
+    def get_index_url(self):
+        if self.index_url_name:
+            return reverse(self.index_url_name)
+
     def get_history_url(self):
         if self.history_url_name:
             return reverse(self.history_url_name, args=(quote(self.object.pk),))
@@ -1253,10 +1307,6 @@ class RevisionsCompareView(WagtailAdminTemplateMixin, TemplateView):
         context.update(
             {
                 "object": self.object,
-                "history_label": self.history_label,
-                "edit_label": self.edit_label,
-                "history_url": self.get_history_url(),
-                "edit_url": self.get_edit_url(),
                 "revision_a": revision_a,
                 "revision_a_heading": revision_a_heading,
                 "revision_b": revision_b,
@@ -1274,6 +1324,7 @@ class UnpublishView(HookResponseMixin, WagtailAdminTemplateMixin, TemplateView):
     edit_url_name = None
     unpublish_url_name = None
     usage_url_name = None
+    page_title = gettext_lazy("Unpublish")
     success_message = gettext_lazy("'%(object)s' unpublished.")
     template_name = "wagtailadmin/generic/confirm_unpublish.html"
 
@@ -1294,12 +1345,15 @@ class UnpublishView(HookResponseMixin, WagtailAdminTemplateMixin, TemplateView):
     def get_usage(self):
         return ReferenceIndex.get_grouped_references_to(self.object)
 
+    def get_breadcrumbs_items(self):
+        return []
+
     def get_objects_to_unpublish(self):
         # Hook to allow child classes to have more objects to unpublish (e.g. page descendants)
         return [self.object]
 
-    def get_object_display_title(self):
-        return str(self.object)
+    def get_page_subtitle(self):
+        return get_latest_str(self.object)
 
     def get_success_message(self):
         if self.success_message is None:
@@ -1365,7 +1419,6 @@ class UnpublishView(HookResponseMixin, WagtailAdminTemplateMixin, TemplateView):
         context = super().get_context_data(**kwargs)
         context["model_opts"] = self.object._meta
         context["object"] = self.object
-        context["object_display_title"] = self.get_object_display_title()
         context["unpublish_url"] = self.get_unpublish_url()
         context["next_url"] = self.get_next_url()
         context["usage_url"] = self.get_usage_url()
@@ -1384,6 +1437,7 @@ class RevisionsUnscheduleView(WagtailAdminTemplateMixin, TemplateView):
         'Version %(revision_id)s of "%(object)s" unscheduled.'
     )
     template_name = "wagtailadmin/shared/revisions/confirm_unschedule.html"
+    page_title = gettext_lazy("Unschedule")
 
     def setup(self, request, pk, revision_id, *args, **kwargs):
         super().setup(request, *args, **kwargs)
@@ -1397,6 +1451,9 @@ class RevisionsUnscheduleView(WagtailAdminTemplateMixin, TemplateView):
             raise Http404
         return get_object_or_404(self.model, pk=unquote(str(self.pk)))
 
+    def get_breadcrumbs_items(self):
+        return []
+
     def get_revision(self):
         return get_object_or_404(self.object.revisions, id=self.revision_id)
 
@@ -1407,7 +1464,7 @@ class RevisionsUnscheduleView(WagtailAdminTemplateMixin, TemplateView):
         )
 
     def get_object_display_title(self):
-        return str(self.object)
+        return get_latest_str(self.object)
 
     def get_success_message(self):
         if self.success_message is None:
@@ -1437,10 +1494,13 @@ class RevisionsUnscheduleView(WagtailAdminTemplateMixin, TemplateView):
         return reverse(self.history_url_name, args=(quote(self.object.pk),))
 
     def get_page_subtitle(self):
-        return _('revision %(revision_id)s of "%(object)s"') % {
-            "revision_id": self.revision.id,
-            "object": self.get_object_display_title(),
-        }
+        return capfirst(
+            _('revision %(revision_id)s of "%(object)s"')
+            % {
+                "revision_id": self.revision.id,
+                "object": self.get_object_display_title(),
+            }
+        )
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -1448,8 +1508,6 @@ class RevisionsUnscheduleView(WagtailAdminTemplateMixin, TemplateView):
             {
                 "object": self.object,
                 "revision": self.revision,
-                "subtitle": self.get_page_subtitle(),
-                "object_display_title": self.get_object_display_title(),
                 "revisions_unschedule_url": self.get_revisions_unschedule_url(),
                 "next_url": self.get_next_url(),
             }

wagtail/admin/views/generic/preview.py

@@ -7,9 +7,12 @@ from django.http.request import QueryDict
 from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
-from django.views.generic import View
+from django.utils.functional import cached_property
+from django.utils.translation import gettext
+from django.views.generic import TemplateView, View
 
 from wagtail.admin.panels import get_edit_handler
+from wagtail.blocks.base import Block
 from wagtail.models import PreviewableMixin, RevisionMixin
 from wagtail.utils.decorators import xframe_options_sameorigin_override
 
@@ -163,3 +166,51 @@ class PreviewRevision(View):
             raise PermissionDenied
 
         return self.revision_object.make_preview_request(request, preview_mode)
+
+
+@method_decorator(xframe_options_sameorigin_override, name="get")
+class StreamFieldBlockPreview(TemplateView):
+    http_method_names = ("get",)
+
+    @cached_property
+    def block_id(self):
+        return self.request.GET.get("id")
+
+    @cached_property
+    def block_def(self) -> Block:
+        if not (block := Block.definition_registry.get(self.block_id)):
+            raise Http404
+        return block
+
+    @cached_property
+    def block_value(self):
+        return self.block_def.get_preview_value()
+
+    @cached_property
+    def page_title(self):
+        return gettext("Preview for %(block_label)s (%(block_type)s)") % {
+            "block_label": self.block_def.label,
+            "block_type": self.block_def.__class__.__name__,
+        }
+
+    @cached_property
+    def base_context(self):
+        # Do NOT use the name `block` in the context, as it will conflict with
+        # the current block inside a template {% block %} tag.
+        # If any changes are made here that needs to be publicly documented,
+        # make sure to update the docs for `Block.get_preview_context`.
+        return {
+            "request": self.request,
+            "block_def": self.block_def,
+            "block_class": self.block_def.__class__,
+            "bound_block": self.block_def.bind(self.block_value),
+            "page_title": self.page_title,
+        }
+
+    def get_template_names(self):
+        return self.block_def.get_preview_template(self.block_value, self.base_context)
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context.update(self.base_context)
+        return self.block_def.get_preview_context(self.block_value, context)

wagtail/admin/views/mixins.py

@@ -14,8 +14,6 @@ from django.utils.formats import get_format
 from django.utils.functional import cached_property
 from django.utils.text import capfirst
 from django.utils.translation import gettext as _
-from openpyxl import Workbook
-from openpyxl.cell import WriteOnlyCell
 
 from wagtail.admin.widgets.button import Button
 from wagtail.coreutils import multigetattr
@@ -208,6 +206,8 @@ class SpreadsheetExportMixin:
 
     def generate_xlsx_row(self, worksheet, row_dict, date_format=None):
         """Generate cells to append to the worksheet"""
+        from openpyxl.cell import WriteOnlyCell
+
         for field, value in row_dict.items():
             cell = WriteOnlyCell(
                 worksheet, self.preprocess_field_value(field, value, self.FORMAT_XLSX)
@@ -246,6 +246,8 @@ class SpreadsheetExportMixin:
 
     def write_xlsx(self, queryset, output):
         """Write an xlsx workbook from a queryset"""
+        from openpyxl import Workbook
+
         workbook = Workbook(write_only=True, iso_dates=True)
 
         worksheet = workbook.create_sheet(title="Sheet1")

wagtail/admin/views/pages/bulk_actions/delete.py

@@ -31,27 +31,15 @@ class DeleteBulkAction(PageBulkAction):
         return num_parent_objects, num_child_objects
 
     def get_success_message(self, num_parent_objects, num_child_objects):
-        if num_parent_objects == 1:
-            if num_child_objects == 0:
-                success_message = _("1 page has been deleted")
-            else:
-                success_message = ngettext(
-                    "1 page and %(num_child_objects)d child page have been deleted",
-                    "1 page and %(num_child_objects)d child pages have been deleted",
-                    num_child_objects,
-                ) % {"num_child_objects": num_child_objects}
+        if num_child_objects > 0:
+            # Translators: This forms a message such as "1 page and 3 child pages have been deleted"
+            return _("%(parent_pages)s and %(child_pages)s have been deleted") % {
+                "parent_pages": self.get_parent_page_text(num_parent_objects),
+                "child_pages": self.get_child_page_text(num_child_objects),
+            }
         else:
-            if num_child_objects == 0:
-                success_message = _(
-                    "%(num_parent_objects)d pages have been deleted"
-                ) % {"num_parent_objects": num_parent_objects}
-            else:
-                success_message = ngettext(
-                    "%(num_parent_objects)d pages and %(num_child_objects)d child page have been deleted",
-                    "%(num_parent_objects)d pages and %(num_child_objects)d child pages have been deleted",
-                    num_child_objects,
-                ) % {
-                    "num_child_objects": num_child_objects,
-                    "num_parent_objects": num_parent_objects,
-                }
-        return success_message
+            return ngettext(
+                "%(num_parent_objects)d page has been deleted",
+                "%(num_parent_objects)d pages have been deleted",
+                num_parent_objects,
+            ) % {"num_parent_objects": num_parent_objects}

wagtail/admin/views/pages/bulk_actions/page_bulk_action.py

@@ -1,4 +1,5 @@
 from django import forms
+from django.utils.translation import ngettext
 
 from wagtail.admin.views.bulk_action import BulkAction
 from wagtail.admin.views.pages.search import page_filter_search
@@ -55,3 +56,19 @@ class PageBulkAction(BulkAction):
 
     def get_execution_context(self):
         return {"user": self.request.user}
+
+    def get_parent_page_text(self, num_parent_objects):
+        # Translators: This appears within a message such as "2 pages and 3 child pages have been published"
+        return ngettext(
+            "%(num_parent_objects)d page",
+            "%(num_parent_objects)d pages",
+            num_parent_objects,
+        ) % {"num_parent_objects": num_parent_objects}
+
+    def get_child_page_text(self, num_child_objects):
+        # Translators: This appears within a message such as "2 pages and 3 child pages have been published"
+        return ngettext(
+            "%(num_child_objects)d child page",
+            "%(num_child_objects)d child pages",
+            num_child_objects,
+        ) % {"num_child_objects": num_child_objects}

wagtail/admin/views/pages/bulk_actions/publish.py

@@ -71,35 +71,15 @@ class PublishBulkAction(PageBulkAction):
 
     def get_success_message(self, num_parent_objects, num_child_objects):
         include_descendants = self.cleaned_form.cleaned_data["include_descendants"]
-        if num_parent_objects == 1:
-            if include_descendants:
-                if num_child_objects == 0:
-                    success_message = _("1 page has been published")
-                else:
-                    success_message = ngettext(
-                        "1 page and %(num_child_objects)d child page have been published",
-                        "1 page and %(num_child_objects)d child pages have been published",
-                        num_child_objects,
-                    ) % {"num_child_objects": num_child_objects}
-            else:
-                success_message = _("1 page has been published")
+        if include_descendants and num_child_objects > 0:
+            # Translators: This forms a message such as "1 page and 3 child pages have been published"
+            return _("%(parent_pages)s and %(child_pages)s have been published") % {
+                "parent_pages": self.get_parent_page_text(num_parent_objects),
+                "child_pages": self.get_child_page_text(num_child_objects),
+            }
         else:
-            if include_descendants:
-                if num_child_objects == 0:
-                    success_message = _(
-                        "%(num_parent_objects)d pages have been published"
-                    ) % {"num_parent_objects": num_parent_objects}
-                else:
-                    success_message = ngettext(
-                        "%(num_parent_objects)d pages and %(num_child_objects)d child page have been published",
-                        "%(num_parent_objects)d pages and %(num_child_objects)d child pages have been published",
-                        num_child_objects,
-                    ) % {
-                        "num_child_objects": num_child_objects,
-                        "num_parent_objects": num_parent_objects,
-                    }
-            else:
-                success_message = _(
-                    "%(num_parent_objects)d pages have been published"
-                ) % {"num_parent_objects": num_parent_objects}
-        return success_message
+            return ngettext(
+                "%(num_parent_objects)d page has been published",
+                "%(num_parent_objects)d pages have been published",
+                num_parent_objects,
+            ) % {"num_parent_objects": num_parent_objects}

wagtail/admin/views/pages/bulk_actions/unpublish.py

@@ -65,35 +65,15 @@ class UnpublishBulkAction(PageBulkAction):
 
     def get_success_message(self, num_parent_objects, num_child_objects):
         include_descendants = self.cleaned_form.cleaned_data["include_descendants"]
-        if num_parent_objects == 1:
-            if include_descendants:
-                if num_child_objects == 0:
-                    success_message = _("1 page has been unpublished")
-                else:
-                    success_message = ngettext(
-                        "1 page and %(num_child_objects)d child page have been unpublished",
-                        "1 page and %(num_child_objects)d child pages have been unpublished",
-                        num_child_objects,
-                    ) % {"num_child_objects": num_child_objects}
-            else:
-                success_message = _("1 page has been unpublished")
+        if include_descendants and num_child_objects > 0:
+            # Translators: This forms a message such as "1 page and 3 child pages have been unpublished"
+            return _("%(parent_pages)s and %(child_pages)s have been unpublished") % {
+                "parent_pages": self.get_parent_page_text(num_parent_objects),
+                "child_pages": self.get_child_page_text(num_child_objects),
+            }
         else:
-            if include_descendants:
-                if num_child_objects == 0:
-                    success_message = _(
-                        "%(num_parent_objects)d pages have been unpublished"
-                    ) % {"num_parent_objects": num_parent_objects}
-                else:
-                    success_message = ngettext(
-                        "%(num_parent_objects)d pages and %(num_child_objects)d child page have been unpublished",
-                        "%(num_parent_objects)d pages and %(num_child_objects)d child pages have been unpublished",
-                        num_child_objects,
-                    ) % {
-                        "num_child_objects": num_child_objects,
-                        "num_parent_objects": num_parent_objects,
-                    }
-            else:
-                success_message = _(
-                    "%(num_parent_objects)d pages have been unpublished"
-                ) % {"num_parent_objects": num_parent_objects}
-        return success_message
+            return ngettext(
+                "%(num_parent_objects)d page has been unpublished",
+                "%(num_parent_objects)d pages have been unpublished",
+                num_parent_objects,
+            ) % {"num_parent_objects": num_parent_objects}

wagtail/admin/views/pages/create.py

@@ -358,6 +358,7 @@ class CreateView(WagtailAdminTemplateMixin, HookResponseMixin, View):
                 show_schedule_publishing_toggle=self.form.show_schedule_publishing_toggle,
                 locale=self.locale,
                 translations=self.translations,
+                parent_page=self.parent_page,
             ),
         ]
         if self.page.is_previewable():

wagtail/admin/views/pages/edit.py

@@ -290,9 +290,7 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
                 reply.log_delete(page_revision=revision, user=self.request.user)
 
     def get_edit_message_button(self):
-        return messages.button(
-            reverse("wagtailadmin_pages:edit", args=(self.page.id,)), _("Edit")
-        )
+        return messages.button(self.get_edit_url(), _("Edit"))
 
     def get_view_draft_message_button(self):
         return messages.button(
@@ -320,7 +318,13 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
         else:
             return self.page
 
-    def dispatch(self, request, page_id):
+    def get_object(self):
+        return self.real_page_record.get_latest_revision_as_object()
+
+    def get_edit_url(self):
+        return reverse("wagtailadmin_pages:edit", args=(self.page.id,))
+
+    def dispatch(self, request, page_id, **kwargs):
         self.real_page_record = get_object_or_404(
             Page.objects.prefetch_workflow_states(), id=page_id
         )
@@ -340,7 +344,14 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
                 "back to a branch where the model class is still present."
             )
 
-        self.page = self.real_page_record.get_latest_revision_as_object()
+        self.revision_id = kwargs.get("revision_id")
+        self.is_reverting = bool(self.revision_id)
+        self.previous_revision = None
+        if self.is_reverting:
+            self.previous_revision = get_object_or_404(
+                self.real_page_record.revisions, id=self.revision_id
+            )
+        self.page = self.get_object()
         self.parent = self.page.get_parent()
         self.scheduled_page = self.real_page_record.get_scheduled_revision_as_object()
 
@@ -393,9 +404,9 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
 
         self.errors_debug = None
 
-        return super().dispatch(request)
+        return super().dispatch(request, page_id, **kwargs)
 
-    def get(self, request):
+    def get(self, request, *args, **kwargs):
         if self.lock:
             lock_message = self.lock.get_message(self.request.user)
             if lock_message:
@@ -454,7 +465,7 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
             ],
         )
 
-    def post(self, request):
+    def post(self, request, *args, **kwargs):
         # Don't allow POST requests if the page is an alias
         if self.page.alias_of_id:
             # Return 405 "Method Not Allowed" response
@@ -491,14 +502,6 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
         return self.workflow_action in available_action_names
 
     def form_valid(self, form):
-        self.is_reverting = bool(self.request.POST.get("revision"))
-        # If a revision ID was passed in the form, get that revision so its
-        # date can be referenced in notification messages
-        if self.is_reverting:
-            self.previous_revision = get_object_or_404(
-                self.page.revisions, id=self.request.POST.get("revision")
-            )
-
         self.has_content_changes = self.form.has_changed()
 
         if self.request.POST.get("action-publish") and self.page_perms.can_publish():
@@ -533,7 +536,7 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
         revision = self.page.save_revision(
             user=self.request.user,
             log_action=True,  # Always log the new revision on edit
-            previous_revision=(self.previous_revision if self.is_reverting else None),
+            previous_revision=self.previous_revision,
         )
 
         self.add_save_confirmation_message()
@@ -558,7 +561,7 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
         revision = self.page.save_revision(
             user=self.request.user,
             log_action=True,  # Always log the new revision on edit
-            previous_revision=(self.previous_revision if self.is_reverting else None),
+            previous_revision=self.previous_revision,
         )
 
         # store submitted go_live_at for messaging below
@@ -572,7 +575,7 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
             revision,
             user=self.request.user,
             changed=self.has_content_changes,
-            previous_revision=(self.previous_revision if self.is_reverting else None),
+            previous_revision=self.previous_revision,
         )
         action.execute(skip_permission_checks=True)
 
@@ -654,7 +657,7 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
         revision = self.page.save_revision(
             user=self.request.user,
             log_action=True,  # Always log the new revision on edit
-            previous_revision=(self.previous_revision if self.is_reverting else None),
+            previous_revision=self.previous_revision,
         )
 
         if self.has_content_changes and "comments" in self.form.formsets:
@@ -701,7 +704,7 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
         revision = self.page.save_revision(
             user=self.request.user,
             log_action=True,  # Always log the new revision on edit
-            previous_revision=(self.previous_revision if self.is_reverting else None),
+            previous_revision=self.previous_revision,
         )
 
         if self.has_content_changes and "comments" in self.form.formsets:
@@ -783,7 +786,7 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
         revision = self.page.save_revision(
             user=self.request.user,
             log_action=True,  # Always log the new revision on edit
-            previous_revision=(self.previous_revision if self.is_reverting else None),
+            previous_revision=self.previous_revision,
         )
 
         if self.has_content_changes and "comments" in self.form.formsets:
@@ -810,7 +813,7 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
             return redirect("wagtailadmin_explore", self.page.get_parent().id)
 
     def redirect_and_remain(self):
-        target_url = reverse("wagtailadmin_pages:edit", args=[self.page.id])
+        target_url = self.get_edit_url()
         if self.next_url:
             # Ensure the 'next' url is passed through again if present
             target_url += "?next=%s" % quote(self.next_url)
@@ -868,6 +871,7 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
                 scheduled_object=self.scheduled_page,
                 locale=self.locale,
                 translations=self.translations,
+                parent_page=self.page.get_parent(),
             ),
         ]
         if self.page.is_previewable():
@@ -904,19 +908,22 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
             self.page.latest_revision_id,
         )
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        user_perms = self.page.permissions_for_user(self.request.user)
-        bound_panel = self.edit_handler.get_bound_panel(
-            instance=self.page, request=self.request, form=self.form
-        )
-        action_menu = PageActionMenu(
+    def get_action_menu(self):
+        return PageActionMenu(
             self.request,
             view="edit",
             page=self.page,
             lock=self.lock,
             locked_for_user=self.locked_for_user,
         )
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        user_perms = self.page.permissions_for_user(self.request.user)
+        bound_panel = self.edit_handler.get_bound_panel(
+            instance=self.page, request=self.request, form=self.form
+        )
+        action_menu = self.get_action_menu()
         side_panels = self.get_side_panels()
 
         media = MediaContainer([bound_panel, self.form, action_menu, side_panels]).media
@@ -932,6 +939,7 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
                 "side_panels": side_panels,
                 "form": self.form,
                 "next": self.next_url,
+                "action_url": self.get_edit_url(),
                 "history_url": self.get_history_url(),
                 "has_unsaved_changes": self.has_unsaved_changes,
                 "page_locked": self.locked_for_user,