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

wagtail/__init__.py

@@ -6,7 +6,7 @@ from wagtail.utils.version import get_semver_version, get_version
 
 # major.minor.patch.release.number
 # release must be one of alpha, beta, rc, or final
-VERSION = (6, 0, 2, "final", 1)
+VERSION = (6, 1, 0, "rc", 1)
 
 __version__ = get_version(VERSION)
 

wagtail/admin/checks.py

@@ -235,3 +235,54 @@ def file_overwrite_check(app_configs, **kwargs):
         )
 
     return errors
+
+
+@register("datetime_format")
+def datetime_format_check(app_configs, **kwargs):
+    """
+    If L10N is enabled, check if WAGTAIL_* formats are compatible with Django input formats.
+    See https://docs.djangoproject.com/en/stable/topics/i18n/formatting/#creating-custom-format-files
+    See https://docs.wagtail.org/en/stable/reference/settings.html#wagtail-date-format-wagtail-datetime-format-wagtail-time-format
+    """
+
+    from django.conf import settings
+    from django.utils import formats, translation
+
+    errors = []
+
+    if not getattr(settings, "USE_L10N", False):
+        return errors
+
+    formats.FORMAT_SETTINGS = formats.FORMAT_SETTINGS.union(
+        [
+            "WAGTAIL_DATE_FORMAT",
+            "WAGTAIL_DATETIME_FORMAT",
+            "WAGTAIL_TIME_FORMAT",
+        ]
+    )
+
+    for code, label in settings.LANGUAGES:
+        with translation.override(code):
+            for wagtail_format, django_formats in [
+                ("WAGTAIL_DATE_FORMAT", "DATE_INPUT_FORMATS"),
+                ("WAGTAIL_DATETIME_FORMAT", "DATETIME_INPUT_FORMATS"),
+                ("WAGTAIL_TIME_FORMAT", "TIME_INPUT_FORMATS"),
+            ]:
+                wagtail_format_value = getattr(settings, wagtail_format, None)
+                django_formats_value = getattr(settings, django_formats, None)
+
+                if wagtail_format_value is None:
+                    # Skip the iteration if wagtail_format is not present
+                    continue
+
+                input_format = formats.get_format_lazy(wagtail_format_value)
+                input_formats = formats.get_format_lazy(django_formats_value)
+                if str(input_format) not in str(input_formats):
+                    errors.append(
+                        Error(
+                            "Configuration error",
+                            hint=f"{wagtail_format} {input_format} must be in {django_formats} for language {label} ({code}).",
+                        )
+                    )
+
+    return errors

wagtail/admin/compare.py

@@ -511,7 +511,7 @@ class ChildRelationComparison:
             # Relations don't have a verbose_name
             if self.label:
                 # If the panel has a label, we set it instead.
-                # See InlinePanel.get_comparision for usage
+                # See InlinePanel.get_comparison for usage
                 verbose_name = self.label
             else:
                 verbose_name = self.field.name.replace("_", " ")

wagtail/admin/filters.py

@@ -2,9 +2,11 @@ import django_filters
 from django import forms
 from django.conf import settings
 from django.db import models
+from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 from django_filters.widgets import SuffixedMultiWidget
 
+from wagtail.admin.models import popular_tags_for_model
 from wagtail.admin.utils import get_user_display_name
 from wagtail.admin.widgets import AdminDateInput, BooleanRadioSelect, FilteredSelect
 from wagtail.coreutils import get_content_languages, get_content_type_label
@@ -16,7 +18,7 @@ class DateRangePickerWidget(SuffixedMultiWidget):
     """
 
     template_name = "wagtailadmin/widgets/daterange_input.html"
-    suffixes = ["after", "before"]
+    suffixes = ["from", "to"]
 
     def __init__(self, attrs=None):
         widgets = (
@@ -191,3 +193,70 @@ class UserModelMultipleChoiceField(django_filters.fields.ModelMultipleChoiceFiel
 
 class MultipleUserFilter(django_filters.ModelMultipleChoiceFilter):
     field_class = UserModelMultipleChoiceField
+
+
+class CollectionChoiceIterator(django_filters.fields.ModelChoiceIterator):
+    @cached_property
+    def min_depth(self):
+        return self.queryset.get_min_depth()
+
+    def choice(self, obj):
+        return (obj.pk, obj.get_indented_name(self.min_depth, html=True))
+
+
+class CollectionChoiceField(django_filters.fields.ModelChoiceField):
+    iterator = CollectionChoiceIterator
+
+
+class CollectionFilter(django_filters.ModelChoiceFilter):
+    field_class = CollectionChoiceField
+
+
+class PopularTagsFilter(django_filters.MultipleChoiceFilter):
+    # This uses a MultipleChoiceFilter instead of a ModelMultipleChoiceFilter
+    # because the queryset has been sliced, which means ModelMultipleChoiceFilter
+    # cannot do further queries to validate the selected tags.
+
+    def __init__(self, *args, use_subquery=False, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.use_subquery = use_subquery
+
+    def filter(self, qs, value):
+        filtered = super().filter(qs, value)
+        if not self.use_subquery:
+            return filtered
+
+        # Workaround for https://github.com/wagtail/wagtail/issues/6616
+        pks = list(filtered.values_list("pk", flat=True))
+        return qs.filter(pk__in=pks)
+
+
+class BaseMediaFilterSet(WagtailFilterSet):
+    permission_policy = None
+
+    def __init__(
+        self, data=None, queryset=None, *, request=None, prefix=None, is_searching=None
+    ):
+        super().__init__(data, queryset, request=request, prefix=prefix)
+        collections_qs = self.permission_policy.collections_user_has_any_permission_for(
+            request.user, ["add", "change"]
+        )
+        # Add collection filter only if there are multiple collections
+        if collections_qs.count() > 1:
+            self.filters["collection_id"] = CollectionFilter(
+                field_name="collection_id",
+                label=_("Collection"),
+                queryset=collections_qs,
+            )
+
+        popular_tags = popular_tags_for_model(self._meta.model)
+
+        if popular_tags:
+            self.filters["tag"] = PopularTagsFilter(
+                label=_("Tag"),
+                field_name="tags__name",
+                choices=[(tag.name, tag.name) for tag in popular_tags],
+                widget=forms.CheckboxSelectMultiple,
+                use_subquery=is_searching,
+                help_text=_("Filter by up to ten most popular tags."),
+            )

wagtail/admin/forms/account.py

@@ -140,4 +140,4 @@ class AvatarPreferencesForm(forms.ModelForm):
 class ThemePreferencesForm(forms.ModelForm):
     class Meta:
         model = UserProfile
-        fields = ["theme"]
+        fields = ["theme", "density"]

wagtail/admin/forms/collections.py

@@ -1,6 +1,7 @@
 from itertools import groupby
 
 from django import forms
+from django.conf import settings
 from django.contrib.auth.models import Group, Permission
 from django.core.exceptions import ValidationError
 from django.db import transaction
@@ -19,6 +20,20 @@ from .view_restrictions import BaseViewRestrictionForm
 
 
 class CollectionViewRestrictionForm(BaseViewRestrictionForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if not getattr(settings, "WAGTAILDOCS_PRIVATE_COLLECTION_OPTIONS", {}).get(
+            "SHARED_PASSWORD",
+            True,
+        ):
+            self.fields["restriction_type"].choices = [
+                choice
+                for choice in CollectionViewRestriction.RESTRICTION_CHOICES
+                if choice[0] != CollectionViewRestriction.PASSWORD
+            ]
+            del self.fields["password"]
+
     class Meta:
         model = CollectionViewRestriction
         fields = ("restriction_type", "password", "groups")

wagtail/admin/forms/pages.py

@@ -124,6 +124,19 @@ class CopyForm(forms.Form):
 
 
 class PageViewRestrictionForm(BaseViewRestrictionForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if not getattr(settings, "WAGTAIL_PRIVATE_PAGE_OPTIONS", {}).get(
+            "SHARED_PASSWORD", True
+        ):
+            self.fields["restriction_type"].choices = [
+                choice
+                for choice in PageViewRestriction.RESTRICTION_CHOICES
+                if choice[0] != PageViewRestriction.PASSWORD
+            ]
+            del self.fields["password"]
+
     class Meta:
         model = PageViewRestriction
         fields = ("restriction_type", "password", "groups")
@@ -215,3 +228,39 @@ class MoveForm(forms.Form):
             label=_("New parent page"),
             help_text=_("Select a new parent for this page."),
         )
+
+
+class ParentChooserForm(forms.Form):
+    def __init__(self, child_page_type, user, *args, **kwargs):
+        self.child_page_type = child_page_type
+        self.user = user
+        super().__init__(*args, **kwargs)
+        self.fields["parent_page"] = forms.ModelChoiceField(
+            queryset=Page.objects.all(),
+            widget=widgets.AdminPageChooser(
+                target_models=self.child_page_type.allowed_parent_page_models(),
+                can_choose_root=True,
+                user_perms="add_subpage",
+            ),
+            label=_("Parent page"),
+            help_text=_("The new page will be a child of this given parent page."),
+        )
+
+    def clean_parent_page(self):
+        parent_page = self.cleaned_data["parent_page"].specific_deferred
+        if not parent_page.permissions_for_user(self.user).can_add_subpage():
+            raise forms.ValidationError(
+                _('You do not have permission to create a page under "%(page_title)s".')
+                % {"page_title": parent_page.get_admin_display_title()}
+            )
+        if not self.child_page_type.can_create_at(parent_page):
+            raise forms.ValidationError(
+                _(
+                    'You cannot create a page of type "%(page_type)s" under "%(page_title)s".'
+                )
+                % {
+                    "page_type": self.child_page_type.get_verbose_name(),
+                    "page_title": parent_page.get_admin_display_title(),
+                }
+            )
+        return parent_page

wagtail/admin/locale/de/LC_MESSAGES/django.po

@@ -335,7 +335,7 @@ msgstr "Sie können diesen Workflow nicht mehrfach derselben Seite zuweisen."
 msgid ""
 "Snippet '%(content_type)s' already has workflow '%(workflow_name)s' assigned."
 msgstr ""
-"Schnipsel '%(content_type)s' wurde bereits Workflow '%(workflow_name)s' "
+"'%(content_type)s'-Objekt wurde bereits Workflow '%(workflow_name)s' "
 "zugewiesen."
 
 msgid "Give your workflow a name"
@@ -404,18 +404,18 @@ msgid "All users in listing selected"
 msgstr "Alle Benutzer der Auflistung ausgewählt"
 
 msgid "1 snippet selected"
-msgstr "1 Schnipsel ausgewählt"
+msgstr "1 Element ausgewählt"
 
 #, python-format
 msgid "%(objects)s snippets selected"
-msgstr "%(objects)s Schnipsel ausgewählt"
+msgstr "%(objects)s Elemente ausgewählt"
 
 #, python-format
 msgid "All %(objects)s snippets on this screen selected"
-msgstr "Alle %(objects)s Schnipsel auf dem Bildschirm ausgewählt"
+msgstr "Alle %(objects)s Elemente auf dem Bildschirm ausgewählt"
 
 msgid "All snippets in listing selected"
-msgstr "Alle Schnipsel der Auflistung ausgewählt"
+msgstr "Alle Elemente der Auflistung ausgewählt"
 
 msgid "1 item selected"
 msgstr "1 Element ausgewählt"