wagtail 6.2.2__py3-none-any.whl → 6.3rc2__py3-none-any.whl

wagtail/admin/views/home.py

@@ -1,4 +1,5 @@
-from typing import Any, Mapping, Union
+from collections.abc import Mapping
+from typing import Any, Union
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
@@ -7,10 +8,11 @@ from django.db.models import Exists, IntegerField, Max, OuterRef, Q
 from django.db.models.functions import Cast
 from django.forms import Media
 from django.http import Http404, HttpResponse
-from django.utils.translation import gettext_lazy
+from django.utils.translation import gettext_lazy as _
 from django.views.generic.base import TemplateView
 
 from wagtail import hooks
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.icons import get_icons
 from wagtail.admin.navigation import get_site_for_user
 from wagtail.admin.site_summary import SiteSummaryPanel
@@ -33,9 +35,8 @@ User = get_user_model()
 
 
 class UpgradeNotificationPanel(Component):
-    name = "upgrade_notification"
     template_name = "wagtailadmin/home/upgrade_notification.html"
-    order = 100
+    dismissible_id = "last_upgrade_check"
 
     def get_upgrade_check_setting(self) -> Union[bool, str]:
         return getattr(settings, "WAGTAIL_ENABLE_UPDATE_CHECK", True)
@@ -46,8 +47,19 @@ class UpgradeNotificationPanel(Component):
             return True
         return False
 
+    def get_dismissible_value(self, user) -> str:
+        if profile := getattr(user, "wagtail_userprofile", None):
+            return profile.dismissibles.get(self.dismissible_id)
+        return None
+
     def get_context_data(self, parent_context: Mapping[str, Any]) -> Mapping[str, Any]:
-        return {"lts_only": self.upgrade_check_lts_only()}
+        return {
+            "lts_only": self.upgrade_check_lts_only(),
+            "dismissible_id": self.dismissible_id,
+            "dismissible_value": self.get_dismissible_value(
+                parent_context["request"].user
+            ),
+        }
 
     def render_html(self, parent_context: Mapping[str, Any] = None) -> str:
         if (
@@ -282,15 +294,20 @@ class RecentEditsPanel(Component):
 
 class HomeView(WagtailAdminTemplateMixin, TemplateView):
     template_name = "wagtailadmin/home.html"
-    page_title = gettext_lazy("Dashboard")
+    page_title = _("Dashboard")
+    permission_policy = page_permission_policy
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         panels = self.get_panels()
+        site_summary = SiteSummaryPanel(self.request)
         site_details = self.get_site_details()
 
-        context["media"] = self.get_media(panels)
+        context["media"] = self.get_media([*panels, site_summary])
         context["panels"] = sorted(panels, key=lambda p: p.order)
+        context["site_summary"] = site_summary
+        context["upgrade_notification"] = UpgradeNotificationPanel()
+        context["search_form"] = SearchForm(placeholder=_("Search all pages…"))
         context["user"] = self.request.user
 
         return {**context, **site_details}
@@ -306,10 +323,8 @@ class HomeView(WagtailAdminTemplateMixin, TemplateView):
     def get_panels(self):
         request = self.request
         panels = [
-            SiteSummaryPanel(request),
             # Disabled until a release warrants the banner.
             # WhatsNewInWagtailVersionPanel(),
-            UpgradeNotificationPanel(),
             WorkflowObjectsToModeratePanel(),
             UserObjectsInWorkflowModerationPanel(),
             RecentEditsPanel(),

wagtail/admin/views/page_privacy.py

@@ -1,9 +1,14 @@
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404
+from django.urls import reverse
+from django.utils.html import format_html
+from django.utils.safestring import mark_safe
+from django.utils.translation import gettext_lazy as _
 
 from wagtail.admin.forms.pages import PageViewRestrictionForm
 from wagtail.admin.modal_workflow import render_modal_workflow
 from wagtail.models import Page, PageViewRestriction
+from wagtail.models.view_restrictions import BaseViewRestriction
 
 
 def set_privacy(request, page_id):
@@ -12,14 +17,20 @@ def set_privacy(request, page_id):
     if not page_perms.can_set_view_restrictions():
         raise PermissionDenied
 
-    # fetch restriction records in depth order so that ancestors appear first
-    restrictions = page.get_view_restrictions().order_by("page__depth")
+    restrictions = page.get_view_restrictions().order_by("-page__depth")
     if restrictions:
-        restriction = restrictions[0]
-        restriction_exists_on_ancestor = restriction.page.id != page.id
+        if restrictions[0].page.id == page.id:
+            restriction = restrictions[0]
+            if len(restrictions) > 1:
+                restriction_on_ancestor = restrictions[1]
+            else:
+                restriction_on_ancestor = None
+        else:
+            restriction = None
+            restriction_on_ancestor = restrictions[0]
     else:
         restriction = None
-        restriction_exists_on_ancestor = False
+        restriction_on_ancestor = None
 
     if request.method == "POST":
         form = PageViewRestrictionForm(
@@ -27,7 +38,7 @@ def set_privacy(request, page_id):
             instance=restriction,
             private_page_options=page.private_page_options,
         )
-        if form.is_valid() and not restriction_exists_on_ancestor:
+        if form.is_valid():
             if form.cleaned_data["restriction_type"] == PageViewRestriction.NONE:
                 # remove any existing restriction
                 if restriction:
@@ -51,37 +62,50 @@ def set_privacy(request, page_id):
             )
 
     else:  # request is a GET
-        if not restriction_exists_on_ancestor:
-            if restriction:
-                form = PageViewRestrictionForm(
-                    instance=restriction, private_page_options=page.private_page_options
-                )
-            else:
-                # no current view restrictions on this page
-                form = PageViewRestrictionForm(
-                    initial={"restriction_type": "none"},
-                    private_page_options=page.private_page_options,
-                )
+        if restriction:
+            form = PageViewRestrictionForm(
+                instance=restriction,
+                private_page_options=page.private_page_options,
+            )
 
-    if restriction_exists_on_ancestor:
-        # display a message indicating that there is a restriction at ancestor level -
-        # do not provide the form for setting up new restrictions
-        return render_modal_workflow(
-            request,
-            "wagtailadmin/page_privacy/ancestor_privacy.html",
-            None,
-            {
-                "page_with_restriction": restriction.page,
-            },
-        )
-    elif len(page.private_page_options) == 0:
+        else:
+            # no current view restrictions on this page
+            form = PageViewRestrictionForm(
+                initial={"restriction_type": "none"},
+                private_page_options=page.private_page_options,
+            )
+
+        if restriction_on_ancestor:
+            ancestor_page_link = format_html(
+                '<a href="{url}">{title}</a>',
+                url=reverse(
+                    "wagtailadmin_pages:edit", args=[restriction_on_ancestor.page_id]
+                ),
+                title=restriction_on_ancestor.page.specific_deferred.get_admin_display_title(),
+            )
+            inherit_from_parent_choice = (
+                BaseViewRestriction.NONE,
+                format_html(
+                    "<span>{}</span>",
+                    mark_safe(
+                        _(
+                            "Privacy is inherited from the ancestor page - %(ancestor_page)s"
+                        )
+                        % {"ancestor_page": ancestor_page_link}
+                    ),
+                ),
+            )
+            form.fields["restriction_type"].choices = [
+                inherit_from_parent_choice
+            ] + list(form.fields["restriction_type"].choices[1:])
+
+    if len(page.private_page_options) == 0:
         return render_modal_workflow(
             request,
             "wagtailadmin/page_privacy/no_privacy.html",
             None,
         )
     else:
-        # no restriction set at ancestor level - can set restrictions here
         return render_modal_workflow(
             request,
             "wagtailadmin/page_privacy/set_privacy.html",

wagtail/admin/views/pages/history.py

@@ -34,6 +34,7 @@ class PageHistoryFilterSet(history.HistoryFilterSet):
 class PageWorkflowHistoryViewMixin:
     model = Page
     pk_url_kwarg = "page_id"
+    edit_url_name = "wagtailadmin_pages:edit"
 
     def dispatch(self, request, *args, **kwargs):
         if not self.object.permissions_for_user(request.user).can_edit():
@@ -44,17 +45,23 @@ class PageWorkflowHistoryViewMixin:
         return super().get_context_data(**kwargs, page=self.object)
 
 
-class WorkflowHistoryView(PageWorkflowHistoryViewMixin, history.WorkflowHistoryView):
+class WorkflowHistoryView(
+    PageWorkflowHistoryViewMixin,
+    GenericPageBreadcrumbsMixin,
+    history.WorkflowHistoryView,
+):
     header_icon = "doc-empty-inverse"
-    workflow_history_url_name = "wagtailadmin_pages:workflow_history"
     workflow_history_detail_url_name = "wagtailadmin_pages:workflow_history_detail"
 
 
 class WorkflowHistoryDetailView(
-    PageWorkflowHistoryViewMixin, history.WorkflowHistoryDetailView
+    PageWorkflowHistoryViewMixin,
+    GenericPageBreadcrumbsMixin,
+    history.WorkflowHistoryDetailView,
 ):
-    object_icon = "doc-empty-inverse"
+    header_icon = "doc-empty-inverse"
     workflow_history_url_name = "wagtailadmin_pages:workflow_history"
+    breadcrumbs_items_to_take = 2
 
 
 class PageHistoryView(GenericPageBreadcrumbsMixin, history.HistoryView):

wagtail/admin/views/pages/listing.py

@@ -19,7 +19,6 @@ from wagtail.admin.filters import (
     MultipleUserFilter,
     WagtailFilterSet,
 )
-from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.ui.components import MediaContainer
 from wagtail.admin.ui.side_panels import (
     PageStatusSidePanel,
@@ -32,6 +31,7 @@ from wagtail.admin.ui.tables.pages import (
     PageStatusColumn,
     PageTable,
     PageTitleColumn,
+    ParentPageColumn,
 )
 from wagtail.admin.views import generic
 from wagtail.models import Page, PageLogEntry, Site, get_page_content_types
@@ -115,7 +115,7 @@ class PageFilterSet(WagtailFilterSet):
         fields = []  # only needed for filters being generated automatically
 
 
-class ExplorablePageFilterSet(PageFilterSet):
+class GenericPageFilterSet(PageFilterSet):
     content_type = MultipleContentTypeFilter(
         label=_("Page type"),
         queryset=lambda request: get_page_content_types(include_base_page_type=False),
@@ -123,29 +123,14 @@ class ExplorablePageFilterSet(PageFilterSet):
     )
 
 
-class IndexView(generic.IndexView):
-    template_name = "wagtailadmin/pages/index.html"
-    results_template_name = "wagtailadmin/pages/index_results.html"
-    permission_policy = page_permission_policy
-    any_permission_required = {
-        "add",
-        "change",
-        "publish",
-        "bulk_delete",
-        "lock",
-        "unlock",
-    }
+class PageListingMixin:
+    template_name = "wagtailadmin/pages/listing.html"
     context_object_name = "pages"
-    page_kwarg = "p"
-    paginate_by = 50
     table_class = PageTable
-    table_classname = "listing full-width"
-    filterset_class = PageFilterSet
-    index_url_name = None
-    index_results_url_name = None
+    filterset_class = GenericPageFilterSet
     default_ordering = "-latest_revision_created_at"
     model = Page
-    _show_breadcrumbs = True
+    is_searchable = True
 
     columns = [
         BulkActionsColumn("bulk_actions"),
@@ -155,12 +140,20 @@ class IndexView(generic.IndexView):
             sort_key="title",
             classname="title",
         ),
+        ParentPageColumn("parent", label=_("Parent")),
         DateColumn(
             "latest_revision_created_at",
             label=_("Updated"),
             sort_key="latest_revision_created_at",
             width="12%",
         ),
+        Column(
+            "type",
+            label=_("Type"),
+            accessor="page_type_display_name",
+            sort_key="content_type",
+            width="12%",
+        ),
         PageStatusColumn(
             "status",
             label=_("Status"),
@@ -169,21 +162,13 @@ class IndexView(generic.IndexView):
         ),
     ]
 
-    def get(self, request):
-        # Search
-        self.query_string = None
-        self.is_searching = False
-        if "q" in self.request.GET:
-            self.search_form = SearchForm(self.request.GET)
-            if self.search_form.is_valid():
-                self.query_string = self.search_form.cleaned_data["q"]
-        else:
-            self.search_form = SearchForm()
-
-        if self.query_string:
-            self.is_searching = True
+    @cached_property
+    def i18n_enabled(self):
+        return getattr(settings, "WAGTAIL_I18N_ENABLED", False)
 
-        return super().get(request)
+    @cached_property
+    def show_locale_labels(self):
+        return self.i18n_enabled
 
     def get_valid_orderings(self):
         valid_orderings = super().get_valid_orderings()
@@ -212,17 +197,8 @@ class IndexView(generic.IndexView):
 
         return ordering
 
-    def get_base_queryset(self):
-        pages = self.model.objects.filter(depth__gt=1)
-        pages = self._annotate_queryset(pages)
-        return pages
-
-    def _annotate_queryset(self, pages):
-        pages = pages.prefetch_related("content_type", "sites_rooted_here").filter(
-            pk__in=self.permission_policy.explorable_instances(
-                self.request.user
-            ).values_list("pk", flat=True)
-        )
+    def annotate_queryset(self, pages):
+        pages = pages.prefetch_related("content_type", "sites_rooted_here")
 
         # We want specific page instances, but do not need streamfield values here
         pages = pages.defer_streamfields().specific()
@@ -230,6 +206,8 @@ class IndexView(generic.IndexView):
         # Annotate queryset with various states to be used later for performance optimisations
         if getattr(settings, "WAGTAIL_WORKFLOW_ENABLED", True):
             pages = pages.prefetch_workflow_states()
+        if self.i18n_enabled:
+            pages = pages.prefetch_related("locale").annotate_has_untranslated_locale()
 
         pages = pages.annotate_site_root_state().annotate_approved_schedule()
 
@@ -268,38 +246,56 @@ class IndexView(generic.IndexView):
     def search_queryset(self, queryset):
         if self.is_searching:
             queryset = queryset.autocomplete(
-                self.query_string, order_by_relevance=(not self.is_explicitly_ordered)
+                self.search_query, order_by_relevance=(not self.is_explicitly_ordered)
             )
 
         return queryset
 
-    def get_index_url(self):
-        return reverse(self.index_url_name)
-
-    def get_index_results_url(self):
-        return reverse(self.index_results_url_name)
-
-    def get_breadcrumbs_items(self):
-        return self.breadcrumbs_items + [{"url": "", "label": self.get_page_title()}]
-
     def get_table_kwargs(self):
         kwargs = super().get_table_kwargs()
         kwargs["actions_next_url"] = self.index_url
+        kwargs["show_locale_labels"] = self.show_locale_labels
         return kwargs
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        context.update(
-            {
-                "ordering": self.ordering,
-                "search_form": self.search_form,
-                "is_searching": self.is_searching,
-            }
-        )
+        if any(isinstance(column, ParentPageColumn) for column in self.columns):
+            Page.objects.annotate_parent_page(context["object_list"])
+
         return context
 
 
+class IndexView(PageListingMixin, generic.IndexView):
+    permission_policy = page_permission_policy
+    any_permission_required = {
+        "add",
+        "change",
+        "publish",
+        "bulk_delete",
+        "lock",
+        "unlock",
+    }
+    template_name = "wagtailadmin/pages/index.html"
+    results_template_name = "wagtailadmin/pages/index_results.html"
+    paginate_by = 50
+    table_classname = "listing full-width"
+    filterset_class = PageFilterSet
+
+    @classproperty
+    def columns(cls):
+        return [col for col in PageListingMixin.columns if col.name != "type"]
+
+    def get_base_queryset(self):
+        pages = self.model.objects.filter(depth__gt=1).filter(
+            pk__in=page_permission_policy.explorable_instances(
+                self.request.user
+            ).values_list("pk", flat=True)
+        )
+        pages = self.annotate_queryset(pages)
+        return pages
+
+
 class ExplorableIndexView(IndexView):
     """
     A version of the page listing where the user is presented with a view of a specified parent page;
@@ -308,24 +304,15 @@ class ExplorableIndexView(IndexView):
     """
 
     template_name = "wagtailadmin/pages/explorable_index.html"
+    results_template_name = "wagtailadmin/pages/explorable_index_results.html"
     index_url_name = "wagtailadmin_explore"
     index_results_url_name = "wagtailadmin_explore_results"
     page_title = _("Exploring")
-    filterset_class = ExplorablePageFilterSet
+    filterset_class = GenericPageFilterSet
 
     @classproperty
     def columns(cls):
-        columns = super().columns.copy()
-        columns.insert(
-            3,
-            Column(
-                "type",
-                label=_("Type"),
-                accessor="page_type_display_name",
-                sort_key="content_type",
-                width="12%",
-            ),
-        )
+        columns = [col for col in PageListingMixin.columns if col.name != "parent"]
         columns.append(NavigateToChildrenColumn("navigate", width="10%"))
         return columns
 
@@ -351,7 +338,6 @@ class ExplorableIndexView(IndexView):
         self.parent_page = self.parent_page.specific
         self.scheduled_page = self.parent_page.get_scheduled_revision_as_object()
 
-        self.i18n_enabled = getattr(settings, "WAGTAIL_I18N_ENABLED", False)
         if self.i18n_enabled and not self.parent_page.is_root():
             self.locale = self.parent_page.locale
             self.translations = self.get_translations()
@@ -367,6 +353,10 @@ class ExplorableIndexView(IndexView):
             self.is_searching or self.is_filtering
         )
 
+    @cached_property
+    def show_locale_labels(self):
+        return self.i18n_enabled and self.parent_page.is_root()
+
     def get_base_queryset(self):
         if self.is_searching or self.is_filtering:
             if self.is_searching_whole_tree:
@@ -376,7 +366,12 @@ class ExplorableIndexView(IndexView):
         else:
             pages = self.parent_page.get_children()
 
-        pages = self._annotate_queryset(pages)
+        pages = pages.filter(
+            pk__in=page_permission_policy.explorable_instances(
+                self.request.user
+            ).values_list("pk", flat=True)
+        )
+        pages = self.annotate_queryset(pages)
         return pages
 
     def search_queryset(self, queryset):
@@ -402,7 +397,6 @@ class ExplorableIndexView(IndexView):
         kwargs = super().get_table_kwargs()
         kwargs["use_row_ordering_attributes"] = self.show_ordering_column
         kwargs["parent_page"] = self.parent_page
-        kwargs["show_locale_labels"] = self.i18n_enabled and self.parent_page.is_root()
 
         if self.show_ordering_column:
             kwargs["caption"] = _(
@@ -464,19 +458,12 @@ class ExplorableIndexView(IndexView):
         context = super().get_context_data(**kwargs)
 
         if self.is_searching:
-            # postprocess this page of results to annotate each result with its parent page
-            parent_page_paths = {
-                page.path[: -page.steplen] for page in context["object_list"]
-            }
-            parent_pages_by_path = {
-                page.path: page
-                for page in Page.objects.filter(path__in=parent_page_paths).specific()
-            }
+            Page.objects.annotate_parent_page(context["object_list"])
             for page in context["object_list"]:
-                parent_page = parent_pages_by_path.get(page.path[: -page.steplen])
                 # add annotation if parent page is found and is not the currently viewed parent
-                if parent_page and parent_page != self.parent_page:
-                    page.annotated_parent_page = parent_page
+                # to be used by PageTitleColumn instead of a dedicated ParentPageColumn
+                if page._parent_page and page._parent_page != self.parent_page:
+                    page.annotated_parent_page = page._parent_page
 
         context.update(
             {

wagtail/admin/views/pages/preview.py

@@ -14,7 +14,7 @@ def view_draft(request, page_id):
         raise PermissionDenied
 
     try:
-        preview_mode = page.default_preview_mode
+        preview_mode = request.GET.get("mode", page.default_preview_mode)
     except IndexError:
         raise PermissionDenied