wagtail 7.0.2__py3-none-any.whl → 7.1__py3-none-any.whl

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

@@ -1,10 +1,14 @@
+from django.conf import settings
+from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
 
+from wagtail.admin.views.bulk_action.mixins import ReferenceIndexMixin
 from wagtail.admin.views.pages.bulk_actions.page_bulk_action import PageBulkAction
+from wagtail.admin.views.pages.utils import type_to_delete_confirmation
 
 
-class DeleteBulkAction(PageBulkAction):
+class DeleteBulkAction(ReferenceIndexMixin, PageBulkAction):
     display_name = _("Delete")
     action_type = "delete"
     aria_label = _("Delete selected pages")
@@ -17,10 +21,34 @@ class DeleteBulkAction(PageBulkAction):
 
     def object_context(self, page):
         return {
-            "item": page,
+            **super().object_context(page),
             "descendant_count": page.get_descendant_count(),
         }
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        pages = context["items"]
+        # Count the total number of pages including descendants
+        total_page_count = len(pages) + sum(page["descendant_count"] for page in pages)
+        wagtail_site_name = getattr(settings, "WAGTAIL_SITE_NAME", "wagtail")
+        context.update(
+            {
+                "wagtail_site_name": wagtail_site_name,
+                "total_page_count": total_page_count,
+                # If the total page count exceeds this limit, then confirm before delete
+                "type_to_confirm_before_delete": total_page_count
+                >= getattr(settings, "WAGTAILADMIN_UNSAFE_PAGE_DELETION_LIMIT", 10),
+            }
+        )
+        return context
+
+    def post(self, request):
+        if type_to_delete_confirmation(request):
+            return super().post(request)
+        else:
+            # Re-render the confirmation page when site name verification fails
+            return self.render_to_response(self.get_context_data())
+
     @classmethod
     def execute_action(cls, objects, user=None, **kwargs):
         num_parent_objects, num_child_objects = 0, 0
@@ -30,6 +58,12 @@ class DeleteBulkAction(PageBulkAction):
             page.delete(user=user)
         return num_parent_objects, num_child_objects
 
+    def get_usage_url(self, item):
+        return (
+            reverse("wagtailadmin_pages:usage", args=(item.pk,))
+            + "?describe_on_delete=1"
+        )
+
     def get_success_message(self, num_parent_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"

wagtail/admin/views/pages/copy.py

@@ -1,5 +1,6 @@
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.translation import gettext as _
 
 from wagtail import hooks
@@ -78,6 +79,10 @@ def copy(request, page_id):
                 new_page = action.execute()
 
             # Give a success message back to the user
+            edit_button = messages.button(
+                reverse("wagtailadmin_pages:edit", args=(new_page.id,)),
+                _("Edit"),
+            )
             if form.cleaned_data.get("copy_subpages"):
                 messages.success(
                     request,
@@ -86,12 +91,14 @@ def copy(request, page_id):
                         "page_title": page.specific_deferred.get_admin_display_title(),
                         "subpages_count": new_page.get_descendants().count(),
                     },
+                    buttons=[edit_button],
                 )
             else:
                 messages.success(
                     request,
                     _("Page '%(page_title)s' copied.")
                     % {"page_title": page.specific_deferred.get_admin_display_title()},
+                    buttons=[edit_button],
                 )
 
             for fn in hooks.get_hooks("after_copy_page"):

wagtail/admin/views/pages/create.py

@@ -13,8 +13,9 @@ from django.utils.translation import gettext as _
 from django.utils.translation import gettext_lazy
 from django.views.generic.base import View
 
-from wagtail.admin import messages, signals
+from wagtail.admin import messages
 from wagtail.admin.action_menu import PageActionMenu
+from wagtail.admin.telepath import JSContext
 from wagtail.admin.ui.components import MediaContainer
 from wagtail.admin.ui.side_panels import (
     ChecksSidePanel,
@@ -32,6 +33,7 @@ from wagtail.models import (
     PageSubscription,
     PageViewRestriction,
 )
+from wagtail.signals import init_new_page
 
 
 def add_subpage(request, parent_page_id):
@@ -389,9 +391,7 @@ class CreateView(WagtailAdminTemplateMixin, HookResponseMixin, View):
         return self.render_to_response(self.get_context_data())
 
     def get(self, request):
-        signals.init_new_page.send(
-            sender=CreateView, page=self.page, parent=self.parent_page
-        )
+        init_new_page.send(sender=CreateView, page=self.page, parent=self.parent_page)
         self.form = self.form_class(
             instance=self.page,
             subscription=self.subscription,
@@ -453,7 +453,12 @@ class CreateView(WagtailAdminTemplateMixin, HookResponseMixin, View):
         )
         side_panels = self.get_side_panels()
 
-        media = MediaContainer([bound_panel, self.form, action_menu, side_panels]).media
+        js_context = JSContext()
+        edit_handler_data = js_context.pack(bound_panel)
+
+        media = MediaContainer(
+            [bound_panel, self.form, action_menu, side_panels, js_context]
+        ).media
 
         context.update(
             {
@@ -461,6 +466,7 @@ class CreateView(WagtailAdminTemplateMixin, HookResponseMixin, View):
                 "page_class": self.page_class,
                 "parent_page": self.parent_page,
                 "edit_handler": bound_panel,
+                "edit_handler_data": edit_handler_data,
                 "action_menu": action_menu,
                 "side_panels": side_panels,
                 "form": self.form,

wagtail/admin/views/pages/delete.py

@@ -10,6 +10,7 @@ from wagtail import hooks
 from wagtail.actions.delete_page import DeletePageAction
 from wagtail.admin import messages
 from wagtail.admin.utils import get_valid_next_url_from_request
+from wagtail.admin.views.pages.utils import type_to_delete_confirmation
 from wagtail.models import Page, ReferenceIndex
 
 
@@ -39,17 +40,14 @@ def delete(request, page_id):
                         pages_to_delete.update(additional_pages)
 
         pages_to_delete = list(pages_to_delete)
+        usage = ReferenceIndex.get_references_to(page).group_by_source_object()
 
         if request.method == "POST":
-            continue_deleting = True
-            if (
-                request.POST.get("confirm_site_name")
-                and request.POST.get("confirm_site_name") != wagtail_site_name
-            ):
-                messages.error(
-                    request, f"Please type '{wagtail_site_name}' to confirm."
-                )
-                continue_deleting = False
+            if usage.is_protected:
+                raise PermissionDenied
+
+            continue_deleting = type_to_delete_confirmation(request)
+
             if continue_deleting:
                 parent_id = page.get_parent().id
                 # Delete the source page.
@@ -81,7 +79,6 @@ def delete(request, page_id):
                     return redirect(next_url)
                 return redirect("wagtailadmin_explore", parent_id)
 
-    usage = ReferenceIndex.get_references_to(page).group_by_source_object()
     descendant_count = page.get_descendant_count()
     return TemplateResponse(
         request,
@@ -96,7 +93,7 @@ def delete(request, page_id):
             "usage_count": usage.count(),
             "is_protected": usage.is_protected,
             # if the number of pages ( child pages + current page) exceeds this limit, then confirm before delete.
-            "confirm_before_delete": (descendant_count + 1)
+            "type_to_confirm_before_delete": (descendant_count + 1)
             >= getattr(settings, "WAGTAILADMIN_UNSAFE_PAGE_DELETION_LIMIT", 10),
             "wagtail_site_name": wagtail_site_name,
             # note that while pages_to_delete may contain a mix of translated pages

wagtail/admin/views/pages/edit.py

@@ -19,6 +19,7 @@ from wagtail.admin import messages
 from wagtail.admin.action_menu import PageActionMenu
 from wagtail.admin.mail import send_notification
 from wagtail.admin.models import EditingSession
+from wagtail.admin.telepath import JSContext
 from wagtail.admin.ui.components import MediaContainer
 from wagtail.admin.ui.editing_sessions import EditingSessionsModule
 from wagtail.admin.ui.side_panels import (
@@ -945,7 +946,12 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
         action_menu = self.get_action_menu()
         side_panels = self.get_side_panels()
 
-        media = MediaContainer([bound_panel, self.form, action_menu, side_panels]).media
+        js_context = JSContext()
+        edit_handler_data = js_context.pack(bound_panel)
+
+        media = MediaContainer(
+            [bound_panel, self.form, action_menu, side_panels, js_context]
+        ).media
 
         context.update(
             {
@@ -953,6 +959,7 @@ class EditView(WagtailAdminTemplateMixin, HookResponseMixin, View):
                 "page_for_status": self.page_for_status,
                 "content_type": self.page_content_type,
                 "edit_handler": bound_panel,
+                "edit_handler_data": edit_handler_data,
                 "errors_debug": self.errors_debug,
                 "action_menu": action_menu,
                 "side_panels": side_panels,

wagtail/admin/views/pages/utils.py

@@ -1,6 +1,9 @@
+from django.conf import settings
 from django.urls import reverse
 from django.utils.functional import cached_property
 
+from wagtail.admin import messages
+
 # Retain backwards compatibility for imports
 from wagtail.admin.utils import (  # noqa: F401
     get_latest_str,
@@ -69,3 +72,19 @@ class GenericPageBreadcrumbsMixin:
             self.breadcrumbs_items
             + super().get_breadcrumbs_items()[-self.breadcrumbs_items_to_take :]
         )
+
+
+def type_to_delete_confirmation(request, context=None):
+    """
+    Checks if a user has correctly typed the site name to confirm page deletion
+    when using a confirmation dialog.
+    """
+    wagtail_site_name = getattr(settings, "WAGTAIL_SITE_NAME", "wagtail")
+    if (
+        request.POST.get("confirm_site_name")
+        and request.POST.get("confirm_site_name") != wagtail_site_name
+    ):
+        messages.error(request, f"Please type '{wagtail_site_name}' to confirm.")
+        return False
+
+    return True

wagtail/admin/viewsets/base.py

@@ -63,13 +63,17 @@ class ViewSet(WagtailMenuRegisterable):
         """
         viewset = self
         overrides = {}
+
+        def make_view_method(viewset_method):
+            def _view_method(self, *args, **kwargs):
+                return viewset_method(*args, **kwargs)
+
+            return _view_method
+
         for method_name in method_names:
             viewset_method = getattr(viewset, method_name, None)
             if viewset_method:
-
-                def view_method(self, *args, **kwargs):
-                    return viewset_method(*args, **kwargs)
-
+                view_method = make_view_method(viewset_method)
                 view_method.__name__ = method_name
                 overrides[method_name] = view_method
 

wagtail/admin/viewsets/chooser.py

@@ -4,10 +4,10 @@ from django.utils.functional import cached_property
 from django.utils.translation import gettext as _
 
 from wagtail.admin.forms.models import register_form_field_override
+from wagtail.admin.telepath import register as register_telepath_adapter
 from wagtail.admin.views.generic import chooser as chooser_views
 from wagtail.admin.widgets.chooser import BaseChooser
 from wagtail.blocks import ChooserBlock
-from wagtail.telepath import register as register_telepath_adapter
 
 from .base import ViewSet
 

wagtail/admin/viewsets/model.py

@@ -442,7 +442,7 @@ class ModelViewSet(ViewSet):
         If set to ``None`` and :attr:`search_backend_name` is set to use a Wagtail search backend,
         the ``search_fields`` attribute of the model will be used instead.
         """
-        return self.index_view_class.search_fields
+        return self.UNDEFINED
 
     @cached_property
     def search_backend_name(self):

wagtail/admin/wagtail_hooks.py

@@ -40,6 +40,7 @@ from wagtail.admin.rich_text.converters.html_to_contentstate import (
 )
 from wagtail.admin.search import SearchArea
 from wagtail.admin.site_summary import PagesSummaryItem
+from wagtail.admin.ui.menus.pages import PageMenuItem
 from wagtail.admin.ui.sidebar import (
     PageExplorerMenuItem as PageExplorerMenuItemComponent,
 )
@@ -51,7 +52,7 @@ from wagtail.admin.views.pages.bulk_actions import (
     UnpublishBulkAction,
 )
 from wagtail.admin.viewsets import viewsets
-from wagtail.admin.widgets import ButtonWithDropdownFromHook, PageListingButton
+from wagtail.admin.widgets import ButtonWithDropdownFromHook
 from wagtail.models import Collection, Page, Task, Workflow
 from wagtail.permissions import (
     collection_permission_policy,
@@ -231,8 +232,6 @@ def page_listing_buttons(page, user, next_url=None):
         next_url=next_url,
         icon_name="dots-horizontal",
         attrs={
-            "target": "_blank",
-            "rel": "noreferrer",
             "aria-label": _("More options for '%(title)s'")
             % {"title": page.get_admin_display_title()},
         },
@@ -240,77 +239,64 @@ def page_listing_buttons(page, user, next_url=None):
     )
 
 
-class PageListingEditButton(PageListingButton):
+class PageListingEditButton(PageMenuItem):
     label = _("Edit")
     icon_name = "edit"
-    aria_label_format = _("Edit '%(title)s'")
     url_name = "wagtailadmin_pages:edit"
 
-    @property
-    def show(self):
-        return self.page_perms.can_edit()
+    def is_shown(self, user):
+        return self.page.permissions_for_user(user).can_edit()
 
 
-class PageListingViewDraftButton(PageListingButton):
+class PageListingViewDraftButton(PageMenuItem):
     label = _("View draft")
     icon_name = "draft"
-    aria_label_format = _("Preview draft version of '%(title)s'")
     url_name = "wagtailadmin_pages:view_draft"
-    attrs = {"rel": "noreferrer"}
+    link_rel = "noreferrer"
 
-    @property
-    def show(self):
+    def is_shown(self, user):
         return self.page.has_unpublished_changes and self.page.is_previewable()
 
 
-class PageListingViewLiveButton(PageListingButton):
+class PageListingViewLiveButton(PageMenuItem):
     label = _("View live")
     icon_name = "doc-empty"
-    aria_label_format = _("View live version of '%(title)s'")
-    attrs = {"rel": "noreferrer"}
+    link_rel = "noreferrer"
 
-    @property
-    def show(self):
+    def is_shown(self, user):
         return self.page.live and self.page.url
 
 
-class PageListingAddChildPageButton(PageListingButton):
+class PageListingAddChildPageButton(PageMenuItem):
     label = _("Add child page")
     icon_name = "circle-plus"
-    aria_label_format = _("Add a child page to '%(title)s'")
     url_name = "wagtailadmin_pages:add_subpage"
 
-    @property
-    def show(self):
-        return self.page_perms.can_add_subpage()
+    def is_shown(self, user):
+        return self.page.permissions_for_user(user).can_add_subpage()
 
 
-class PageListingMoveButton(PageListingButton):
+class PageListingMoveButton(PageMenuItem):
     label = _("Move")
     icon_name = "arrow-right-full"
-    aria_label_format = _("Move page '%(title)s'")
     url_name = "wagtailadmin_pages:move"
 
-    @property
-    def show(self):
-        return self.page_perms.can_move()
+    def is_shown(self, user):
+        return self.page.permissions_for_user(user).can_move()
 
 
-class PageListingCopyButton(PageListingButton):
+class PageListingCopyButton(PageMenuItem):
     label = _("Copy")
     icon_name = "copy"
-    aria_label_format = _("Copy page '%(title)s'")
     url_name = "wagtailadmin_pages:copy"
 
-    @property
-    def show(self):
-        return self.page_perms.can_copy()
+    def is_shown(self, user):
+        return self.page.permissions_for_user(user).can_copy()
 
 
-class PageListingDeleteButton(PageListingButton):
+class PageListingDeleteButton(PageMenuItem):
     label = _("Delete")
     icon_name = "bin"
-    aria_label_format = _("Delete page '%(title)s'")
 
     @cached_property
     def url(self):
@@ -332,41 +318,34 @@ class PageListingDeleteButton(PageListingButton):
                     url += "?" + urlencode({"next": self.next_url})
             return url
 
-    @property
-    def show(self):
-        return self.page_perms.can_delete()
+    def is_shown(self, user):
+        return self.page.permissions_for_user(user).can_delete()
 
 
-class PageListingUnpublishButton(PageListingButton):
+class PageListingUnpublishButton(PageMenuItem):
     label = _("Unpublish")
     icon_name = "download"
-    aria_label_format = _("Unpublish page '%(title)s'")
     url_name = "wagtailadmin_pages:unpublish"
 
-    @property
-    def show(self):
-        return self.page_perms.can_unpublish()
+    def is_shown(self, user):
+        return self.page.permissions_for_user(user).can_unpublish()
 
 
-class PageListingHistoryButton(PageListingButton):
+class PageListingHistoryButton(PageMenuItem):
     label = _("History")
     icon_name = "history"
-    aria_label_format = _("View page history for '%(title)s'")
     url_name = "wagtailadmin_pages:history"
 
-    @property
-    def show(self):
-        return self.page_perms.can_view_revisions()
+    def is_shown(self, user):
+        return self.page.permissions_for_user(user).can_view_revisions()
 
 
-class PageListingSortMenuOrderButton(PageListingButton):
+class PageListingSortMenuOrderButton(PageMenuItem):
     label = _("Sort menu order")
     icon_name = "list-ul"
-    aria_label_format = _("Change ordering of child pages of '%(title)s'")
 
-    @property
-    def show(self):
-        return self.page_perms.can_reorder_children()
+    def is_shown(self, user):
+        return self.page.permissions_for_user(user).can_reorder_children()
 
     @cached_property
     def url(self):
@@ -375,38 +354,32 @@ class PageListingSortMenuOrderButton(PageListingButton):
 
 @hooks.register("register_page_listing_more_buttons")
 def page_listing_more_buttons(page, user, next_url=None):
-    yield PageListingEditButton(page=page, user=user, next_url=next_url, priority=2)
-    yield PageListingViewDraftButton(page=page, user=user, priority=4)
-    yield PageListingViewLiveButton(page=page, user=user, url=page.url, priority=6)
-    yield PageListingAddChildPageButton(
-        page=page, user=user, next_url=next_url, priority=8
-    )
-    yield PageListingMoveButton(page=page, user=user, priority=10)
-    yield PageListingCopyButton(page=page, user=user, next_url=next_url, priority=20)
-    yield PageListingDeleteButton(page=page, user=user, next_url=next_url, priority=30)
-    yield PageListingUnpublishButton(
-        page=page, user=user, next_url=next_url, priority=40
-    )
-    yield PageListingHistoryButton(page=page, user=user, priority=50)
-    yield PageListingSortMenuOrderButton(page=page, user=user, priority=60)
+    yield PageListingEditButton(page=page, next_url=next_url, priority=2)
+    yield PageListingViewDraftButton(page=page, priority=4)
+    yield PageListingViewLiveButton(page=page, url=page.url, priority=6)
+    yield PageListingAddChildPageButton(page=page, next_url=next_url, priority=8)
+    yield PageListingMoveButton(page=page, priority=10)
+    yield PageListingCopyButton(page=page, next_url=next_url, priority=20)
+    yield PageListingDeleteButton(page=page, next_url=next_url, priority=30)
+    yield PageListingUnpublishButton(page=page, next_url=next_url, priority=40)
+    yield PageListingHistoryButton(page=page, priority=50)
+    yield PageListingSortMenuOrderButton(page=page, priority=60)
 
 
 @hooks.register("register_page_header_buttons")
 def page_header_buttons(page, user, view_name, next_url=None):
-    yield PageListingEditButton(page=page, user=user, priority=10)
+    yield PageListingEditButton(page=page, priority=10)
 
     # "add child" is a separate primary action on the index page
     if view_name != "index":
-        yield PageListingAddChildPageButton(page=page, user=user, priority=15)
+        yield PageListingAddChildPageButton(page=page, priority=15)
 
-    yield PageListingMoveButton(page=page, user=user, priority=20)
-    yield PageListingCopyButton(page=page, user=user, next_url=next_url, priority=30)
-    yield PageListingDeleteButton(page=page, user=user, next_url=next_url, priority=50)
-    yield PageListingUnpublishButton(
-        page=page, user=user, next_url=next_url, priority=60
-    )
-    yield PageListingHistoryButton(page=page, user=user, priority=65)
-    yield PageListingSortMenuOrderButton(page=page, user=user, priority=70)
+    yield PageListingMoveButton(page=page, priority=20)
+    yield PageListingCopyButton(page=page, next_url=next_url, priority=30)
+    yield PageListingDeleteButton(page=page, next_url=next_url, priority=50)
+    yield PageListingUnpublishButton(page=page, next_url=next_url, priority=60)
+    yield PageListingHistoryButton(page=page, priority=65)
+    yield PageListingSortMenuOrderButton(page=page, priority=70)
 
 
 @hooks.register("register_admin_urls")
@@ -1083,6 +1056,7 @@ def register_icons(icons):
         "form.svg",
         "glasses.svg",
         "globe.svg",
+        "grid.svg",
         "grip.svg",
         "group.svg",
         "h1.svg",