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

wagtail/admin/views/generic/multiple_upload.py

@@ -1,5 +1,6 @@
 import os.path
 
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
 from django.http import HttpResponseBadRequest, JsonResponse
 from django.shortcuts import get_object_or_404
@@ -10,13 +11,13 @@ from django.views.decorators.vary import vary_on_headers
 from django.views.generic.base import TemplateView, View
 
 from wagtail.admin.views.generic import PermissionCheckedMixin
+from wagtail.models import UploadedFile
 
 
 class AddView(PermissionCheckedMixin, TemplateView):
     # subclasses need to provide:
     # - permission_policy
     # - template_name
-    # - upload_model
 
     # - edit_object_url_name
     # - delete_object_url_name
@@ -152,10 +153,12 @@ class AddView(PermissionCheckedMixin, TemplateView):
             return JsonResponse(self.get_invalid_response_data(form))
         else:
             # Some other field of the form has failed validation, e.g. a required metadata field
-            # on a custom image model. Store the object as an upload_model instance instead and
+            # on a custom image model. Store the object as an UploadedFile instance instead and
             # present the edit form so that it will become a proper object when successfully filled in
-            self.upload_object = self.upload_model.objects.create(
-                file=self.request.FILES["files[]"], uploaded_by_user=self.request.user
+            self.upload_object = UploadedFile.objects.create(
+                for_content_type=ContentType.objects.get_for_model(self.get_model()),
+                file=self.request.FILES["files[]"],
+                uploaded_by_user=self.request.user,
             )
             self.object = self.model(
                 title=self.request.FILES["files[]"].name,
@@ -297,7 +300,6 @@ class CreateFromUploadView(View):
     # subclasses need to provide:
     # - edit_upload_url_name
     # - delete_upload_url_name
-    # - upload_model
     # - upload_pk_url_kwarg
     # - edit_upload_form_prefix
     # - context_object_id_name
@@ -320,7 +322,11 @@ class CreateFromUploadView(View):
         self.model = self.get_model()
         self.form_class = self.get_edit_form_class()
 
-        self.upload = get_object_or_404(self.upload_model, id=upload_id)
+        self.upload = get_object_or_404(
+            UploadedFile,
+            id=upload_id,
+            for_content_type=ContentType.objects.get_for_model(self.model),
+        )
 
         if self.upload.uploaded_by_user != request.user:
             raise PermissionDenied
@@ -369,14 +375,17 @@ class CreateFromUploadView(View):
 
 class DeleteUploadView(View):
     # subclasses need to provide:
-    # - upload_model
     # - upload_pk_url_kwarg
 
     http_method_names = ["post"]
 
     def post(self, request, *args, **kwargs):
         upload_id = kwargs[self.upload_pk_url_kwarg]
-        upload = get_object_or_404(self.upload_model, id=upload_id)
+        upload = get_object_or_404(
+            UploadedFile,
+            id=upload_id,
+            for_content_type=ContentType.objects.get_for_model(self.get_model()),
+        )
 
         if upload.uploaded_by_user != request.user:
             raise PermissionDenied

wagtail/admin/views/generic/usage.py

@@ -38,8 +38,9 @@ class UsageView(PermissionCheckedMixin, BaseObjectMixin, BaseListingView):
             return object.get_latest_revision_as_object()
         return object
 
-    def get_edit_url(self):
-        return reverse(self.edit_url_name, args=(quote(self.object.pk),))
+    def get_edit_url(self, instance):
+        if self.edit_url_name:
+            return reverse(self.edit_url_name, args=(quote(instance.pk),))
 
     def get_usage_url(self, instance):
         if self.usage_url_name:
@@ -60,10 +61,11 @@ class UsageView(PermissionCheckedMixin, BaseObjectMixin, BaseListingView):
                     "label": capfirst(self.object._meta.verbose_name_plural),
                 }
             )
-        if self.edit_url_name:
+        edit_url = self.get_edit_url(self.object)
+        if edit_url:
             items.append(
                 {
-                    "url": self.get_edit_url(),
+                    "url": edit_url,
                     "label": get_latest_str(self.object),
                 }
             )
@@ -78,13 +80,17 @@ class UsageView(PermissionCheckedMixin, BaseObjectMixin, BaseListingView):
 
     @cached_property
     def header_buttons(self):
-        return [
-            HeaderButton(
-                label=_("Edit"),
-                url=self.get_edit_url(),
-                icon_name="edit",
-            ),
-        ]
+        edit_url = self.get_edit_url(self.object)
+        buttons = []
+        if edit_url:
+            buttons.append(
+                HeaderButton(
+                    label=_("Edit"),
+                    url=edit_url,
+                    icon_name="edit",
+                )
+            )
+        return buttons
 
     def get_queryset(self):
         return ReferenceIndex.get_references_to(self.object).group_by_source_object()

wagtail/admin/views/home.py

@@ -161,17 +161,20 @@ class WorkflowObjectsToModeratePanel(Component):
             TaskState.objects.reviewable_by(request.user)
             .select_related(
                 "revision",
-                "task",
                 "revision__user",
                 "workflow_state",
+                "workflow_state__workflow",
             )
             .prefetch_related(
                 "revision__content_object",
                 "revision__content_object__latest_revision",
-                "revision__content_object__live_revision",
             )
             .order_by("-started_at")
+            .annotate(
+                previous_revision_id=Revision.objects.previous_revision_id_subquery(),
+            )
         )
+
         for state in states:
             obj = state.revision.content_object
             # Skip task states where the revision's GenericForeignKey points to
@@ -197,17 +200,12 @@ class WorkflowObjectsToModeratePanel(Component):
             if not getattr(obj, "is_previewable", False):
                 workflow_preview_url_name = None
 
-            try:
-                previous_revision = state.revision.get_previous()
-            except Revision.DoesNotExist:
-                previous_revision = None
-
             context["states"].append(
                 {
                     "obj": obj,
                     "revision": state.revision,
-                    "previous_revision": previous_revision,
-                    "live_revision": obj.live_revision,
+                    "previous_revision_id": state.previous_revision_id,
+                    "live_revision_id": obj.live_revision_id,
                     "task_state": state,
                     "actions": actions,
                     "workflow_tasks": workflow_tasks,
@@ -233,7 +231,9 @@ class LockedPagesPanel(Component):
                 "locked_pages": Page.objects.filter(
                     locked=True,
                     locked_by=request.user,
-                ),
+                )
+                .order_by("-locked_at", "-latest_revision_created_at", "-pk")
+                .specific(defer=True),
                 "can_remove_locks": page_permission_policy.user_has_permission(
                     request.user, "unlock"
                 ),
@@ -264,8 +264,11 @@ class RecentEditsPanel(Component):
             .order_by("-latest_date")[:edit_count]
         )
         # Retrieve the page objects for those IDs
-        pages_mapping = Page.objects.specific().in_bulk(
-            [log["page_id"] for log in last_edits_dates]
+        pages_mapping = (
+            Page.objects.specific()
+            .prefetch_workflow_states()
+            .annotate_approved_schedule()
+            .in_bulk([log["page_id"] for log in last_edits_dates])
         )
         # Compile a list of (latest edit timestamp, page object) tuples
         last_edits = []

wagtail/admin/views/mixins.py

@@ -11,10 +11,13 @@ from django.utils import timezone
 from django.utils.dateformat import Formatter
 from django.utils.encoding import force_str
 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
 
 
@@ -301,3 +304,30 @@ class SpreadsheetExportMixin:
     @property
     def csv_export_url(self):
         return self.get_export_url("csv")
+
+    @cached_property
+    def show_export_buttons(self):
+        return bool(self.list_export)
+
+    @cached_property
+    def header_more_buttons(self):
+        buttons = super().header_more_buttons.copy()
+        if self.show_export_buttons:
+            buttons.append(
+                Button(
+                    _("Download XLSX"),
+                    url=self.xlsx_export_url,
+                    icon_name="download",
+                    priority=90,
+                )
+            )
+            buttons.append(
+                Button(
+                    _("Download CSV"),
+                    url=self.csv_export_url,
+                    icon_name="download",
+                    priority=100,
+                )
+            )
+
+        return buttons

wagtail/admin/views/pages/choose_parent.py

@@ -0,0 +1,73 @@
+from django.contrib.admin.utils import quote
+from django.shortcuts import redirect
+from django.urls import reverse
+from django.utils.functional import cached_property
+from django.utils.text import capfirst
+from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy
+from django.views.generic import FormView
+
+from wagtail.admin.forms.pages import ParentChooserForm
+from wagtail.admin.views.generic.base import WagtailAdminTemplateMixin
+from wagtail.models import Page
+
+
+class ChooseParentView(WagtailAdminTemplateMixin, FormView):
+    template_name = "wagtailadmin/pages/choose_parent.html"
+    model = Page
+    index_url_name = None
+    page_title = gettext_lazy("Choose parent")
+
+    def get_form(self):
+        if self.request.method == "POST":
+            return ParentChooserForm(self.model, self.request.user, self.request.POST)
+        return ParentChooserForm(self.model, self.request.user)
+
+    def get_index_url(self):
+        if self.index_url_name:
+            return reverse(self.index_url_name)
+
+    def get_breadcrumbs_items(self):
+        items = []
+        index_url = self.get_index_url()
+        if index_url:
+            items.append(
+                {
+                    "url": index_url,
+                    "label": capfirst(self.model._meta.verbose_name_plural),
+                }
+            )
+        items.append(
+            {
+                "url": "",
+                "label": self.get_page_title(),
+                "sublabel": self.get_page_subtitle(),
+            }
+        )
+
+        return self.breadcrumbs_items + items
+
+    def get_page_subtitle(self):
+        return self.model.get_verbose_name()
+
+    @cached_property
+    def submit_button_label(self):
+        return _("Create a new %(model_name)s") % {
+            "model_name": self.model._meta.verbose_name,
+        }
+
+    def form_valid(self, form):
+        model_opts = self.model._meta
+        parent_id = quote(form.cleaned_data["parent_page"].pk)
+        return redirect(
+            "wagtailadmin_pages:add",
+            model_opts.app_label,
+            model_opts.model_name,
+            parent_id,
+        )
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["media"] = context["form"].media
+        context["submit_button_label"] = self.submit_button_label
+        return context

wagtail/admin/views/pages/history.py

@@ -1,57 +1,34 @@
 import django_filters
-from django import forms
 from django.core.exceptions import PermissionDenied
+from django.db.models import Q
 from django.shortcuts import get_object_or_404
-from django.utils.decorators import method_decorator
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy
 
-from wagtail.admin.auth import user_has_any_page_permission, user_passes_test
-from wagtail.admin.filters import DateRangePickerWidget, WagtailFilterSet
 from wagtail.admin.views.generic import history
-from wagtail.admin.views.reports import ReportView
-from wagtail.log_actions import registry as log_action_registry
+from wagtail.admin.views.pages.utils import (
+    GenericPageBreadcrumbsMixin,
+)
+from wagtail.admin.widgets import BooleanRadioSelect
 from wagtail.models import Page, PageLogEntry
+from wagtail.permissions import page_permission_policy
 
 
-def get_actions_for_filter():
-    # Only return those actions used by page log entries.
-    actions = set(PageLogEntry.objects.all().get_actions())
-    return [
-        action for action in log_action_registry.get_choices() if action[0] in actions
-    ]
-
-
-class PageHistoryReportFilterSet(WagtailFilterSet):
-    action = django_filters.ChoiceFilter(
-        label=_("Action"),
-        # choices are set dynamically in __init__()
-    )
-    hide_commenting_actions = django_filters.BooleanFilter(
-        label=_("Hide commenting actions"),
-        method="filter_hide_commenting_actions",
-        widget=forms.CheckboxInput,
-    )
-    user = django_filters.ModelChoiceFilter(
-        label=_("User"),
-        field_name="user",
-        queryset=lambda request: PageLogEntry.objects.all().get_users(),
-    )
-    timestamp = django_filters.DateFromToRangeFilter(
-        label=_("Date"), widget=DateRangePickerWidget
+class PageHistoryFilterSet(history.HistoryFilterSet):
+    is_commenting_action = django_filters.BooleanFilter(
+        label=gettext_lazy("Is commenting action"),
+        method="filter_is_commenting_action",
+        widget=BooleanRadioSelect,
     )
 
-    def filter_hide_commenting_actions(self, queryset, name, value):
-        if value:
-            queryset = queryset.exclude(action__startswith="wagtail.comments")
-        return queryset
+    def filter_is_commenting_action(self, queryset, name, value):
+        if value is None:
+            return queryset
 
-    class Meta:
-        model = PageLogEntry
-        fields = ["action", "user", "timestamp", "hide_commenting_actions"]
+        q = Q(action__startswith="wagtail.comments")
+        if value is False:
+            q = ~q
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.filters["action"].extra["choices"] = get_actions_for_filter()
+        return queryset.filter(q)
 
 
 class PageWorkflowHistoryViewMixin:
@@ -80,28 +57,39 @@ class WorkflowHistoryDetailView(
     workflow_history_url_name = "wagtailadmin_pages:workflow_history"
 
 
-class PageHistoryView(ReportView):
+class PageHistoryView(GenericPageBreadcrumbsMixin, history.HistoryView):
     template_name = "wagtailadmin/pages/history.html"
-    title = _("Page history")
-    header_icon = "history"
-    paginate_by = 20
-    filterset_class = PageHistoryReportFilterSet
-
-    @method_decorator(user_passes_test(user_has_any_page_permission))
-    def dispatch(self, request, *args, **kwargs):
-        self.page = get_object_or_404(Page, id=kwargs.pop("page_id")).specific
-
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_context_data(self, *args, object_list=None, **kwargs):
-        context = super().get_context_data(*args, object_list=object_list, **kwargs)
-        context["page"] = self.page
-        context["subtitle"] = self.page.get_admin_display_title()
-        context["page_latest_revision"] = self.page.get_latest_revision()
-
-        return context
-
-    def get_queryset(self):
-        return PageLogEntry.objects.filter(page=self.page).select_related(
-            "revision", "user", "user__wagtail_userprofile"
-        )
+    filterset_class = PageHistoryFilterSet
+    model = Page
+    pk_url_kwarg = "page_id"
+    permission_policy = page_permission_policy
+    any_permission_required = {
+        "add",
+        "change",
+        "publish",
+        "bulk_delete",
+        "lock",
+        "unlock",
+    }
+    history_url_name = "wagtailadmin_pages:history"
+    history_results_url_name = "wagtailadmin_pages:history_results"
+    edit_url_name = "wagtailadmin_pages:edit"
+    revisions_view_url_name = "wagtailadmin_pages:revisions_view"
+    revisions_revert_url_name = "wagtailadmin_pages:revisions_revert"
+    revisions_compare_url_name = "wagtailadmin_pages:revisions_compare"
+    revisions_unschedule_url_name = "wagtailadmin_pages:revisions_unschedule"
+
+    def get_object(self):
+        return get_object_or_404(Page, id=self.pk).specific
+
+    def get_page_subtitle(self):
+        return self.object.get_admin_display_title()
+
+    def user_can_unschedule(self):
+        return self.object.permissions_for_user(self.request.user).can_unschedule()
+
+    def get_base_queryset(self):
+        return self._annotate_queryset(PageLogEntry.objects.filter(page=self.object))
+
+    def _annotate_queryset(self, queryset):
+        return super()._annotate_queryset(queryset).select_related("page")