wagtail 6.4.1__py3-none-any.whl → 7.0rc1__py3-none-any.whl

wagtail/admin/menu.py

@@ -1,5 +1,3 @@
-from warnings import warn
-
 from django.core.exceptions import ImproperlyConfigured
 from django.forms import Media, MediaDefiningClass
 from django.utils.functional import cached_property
@@ -8,7 +6,6 @@ from wagtail import hooks
 from wagtail.admin.ui.sidebar import LinkMenuItem as LinkMenuItemComponent
 from wagtail.admin.ui.sidebar import SubMenuItem as SubMenuItemComponent
 from wagtail.coreutils import cautious_slugify
-from wagtail.utils.deprecation import RemovedInWagtail70Warning
 
 
 class MenuItem(metaclass=MediaDefiningClass):
@@ -18,19 +15,13 @@ class MenuItem(metaclass=MediaDefiningClass):
         url,
         name=None,
         classname="",
-        classnames="",
         icon_name="",
         attrs=None,
         order=1000,
     ):
-        if classnames:
-            warn(
-                "The `classnames` kwarg for MenuItem is deprecated - use `classname` instead.",
-                category=RemovedInWagtail70Warning,
-            )
         self.label = label
         self.url = url
-        self.classname = classname or classnames
+        self.classname = classname
         self.icon_name = icon_name
         self.name = name or cautious_slugify(str(label))
         self.attrs = attrs or {}

wagtail/admin/paginator.py

@@ -0,0 +1,95 @@
+from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
+from django.utils.functional import cached_property
+from django.utils.translation import gettext as _
+
+
+class WagtailPaginator(Paginator):
+    num_page_buttons = 6
+
+    @cached_property
+    def model(self):
+        return getattr(self.object_list, "model", None)
+
+    @cached_property
+    def verbose_name(self):
+        if self.model:
+            return self.model._meta.verbose_name
+        return _("item")
+
+    @cached_property
+    def verbose_name_plural(self):
+        if self.model:
+            return self.model._meta.verbose_name_plural
+        return _("items")
+
+    @cached_property
+    def items_count_label(self):
+        if self.count == 1:
+            return f"1 {self.verbose_name}"
+        else:
+            return f"{self.count} {self.verbose_name_plural}"
+
+    def get_elided_page_range(self, page_number):
+        """
+        Provides a range of page numbers where the number of positions
+        occupied by page numbers and ellipses is fixed to num_page_buttons.
+
+        For example, if there are 10 pages where num_page_buttons is 6, the output will be:
+        At page 1:  1 2 3 4 … 10
+        At page 6:  1 … 6 7 … 10
+        At page 10: 1 … 7 8 9 10
+
+        The paginator will show the current page in the middle (odd number of buttons)
+        or to the left side of the middle (even number of buttons).
+        """
+
+        try:
+            number = self.validate_number(page_number)
+        except PageNotAnInteger:
+            number = 1
+        except EmptyPage:
+            number = self.num_pages
+
+        if self.num_page_buttons < 5:
+            # We provide no page range if fewer than 5 num_page_buttons.
+            # This displays only "Previous" and "Next" buttons.
+            return []
+
+        # Provide all page numbers if fewer than num_page_buttons.
+        if self.num_pages <= self.num_page_buttons:
+            yield from self.page_range
+            return
+
+        # These thresholds are the maximum number of buttons
+        # that can be shown on the start or end of the page range
+        # before the middle part of the range expands.
+        # For even num_page_buttons values both thresholds are the same.
+        # For odd num_page_buttons values the start threshold is one more than the end threshold.
+        end_threshold = self.num_page_buttons // 2
+        start_threshold = end_threshold + (self.num_page_buttons % 2)
+
+        # Show the first page.
+        yield 1
+
+        # Show middle pages.
+        if number <= start_threshold:
+            # Result: 1 [ 2 3 4 … ] 10
+            yield from range(2, self.num_page_buttons - 1)
+            yield self.ELLIPSIS
+        elif number < self.num_pages - end_threshold:
+            # Result: 1 [ … 5 6* 7 … ] 10
+            # 4 spaces are occupied by first/last page numbers and ellipses
+            middle_size = self.num_page_buttons - 4
+            offset = (middle_size - 1) // 2
+            yield self.ELLIPSIS
+            yield from range(number - offset, number + middle_size - offset)
+            yield self.ELLIPSIS
+        else:
+            # Result: 1 [ … 7 8 9 ] 10
+            yield self.ELLIPSIS
+            yield from range(
+                self.num_pages - (self.num_page_buttons - 3), self.num_pages
+            )
+
+        # Show the last page.
+        yield self.num_pages

wagtail/admin/panels/field_panel.py

@@ -25,6 +25,7 @@ class FieldPanel(Panel):
         disable_comments=None,
         permission=None,
         read_only=False,
+        required_on_save=None,
         **kwargs,
     ):
         super().__init__(**kwargs)
@@ -33,6 +34,7 @@ class FieldPanel(Panel):
         self.disable_comments = disable_comments
         self.permission = permission
         self.read_only = read_only
+        self.required_on_save = required_on_save
 
     def clone_kwargs(self):
         kwargs = super().clone_kwargs()
@@ -42,6 +44,7 @@ class FieldPanel(Panel):
             disable_comments=self.disable_comments,
             permission=self.permission,
             read_only=self.read_only,
+            required_on_save=self.required_on_save,
         )
         return kwargs
 
@@ -52,6 +55,27 @@ class FieldPanel(Panel):
         opts = {
             "fields": [self.field_name],
         }
+
+        required_on_save = self.required_on_save
+        if required_on_save is None:
+            # If required_on_save is not explicitly set, treat it as false unless:
+            # - it corresponds to a model field with required_on_save=True (such as page title)
+            # - it corresponds to a non-null, non-text-typed model field (in which case a blank value
+            #   is not valid at the database level)
+            try:
+                db_field = self.db_field
+            except FieldDoesNotExist:
+                required_on_save = False
+            else:
+                required_on_save = getattr(db_field, "required_on_save", False) or (
+                    db_field.null is False
+                    and db_field.get_internal_type()
+                    not in ("CharField", "TextField", "JSONField")
+                )
+
+        if not required_on_save:
+            opts["defer_required_on_fields"] = [self.field_name]
+
         if self.widget:
             opts["widgets"] = {self.field_name: self.widget}
 
@@ -84,14 +108,12 @@ class FieldPanel(Panel):
 
     @cached_property
     def db_field(self):
-        try:
-            model = self.model
-        except AttributeError:
+        if self.model is None:
             raise ImproperlyConfigured(
                 "%r must be bound to a model before calling db_field" % self
             )
 
-        return model._meta.get_field(self.field_name)
+        return self.model._meta.get_field(self.field_name)
 
     @property
     def clean_name(self):
@@ -110,8 +132,7 @@ class FieldPanel(Panel):
             labels = dict(choices)
             display_values = [
                 str(labels.get(v, v))  # Use raw value if no match found
-                for v in
-                (
+                for v in (
                     # Account for single AND multiple choice fields
                     tuple(value) if isinstance(value, (list, tuple)) else (value,)
                 )

wagtail/admin/panels/inline_panel.py

@@ -7,7 +7,7 @@ from django.utils.text import capfirst
 
 from wagtail.admin import compare
 
-from .base import Panel
+from .base import Panel, get_form_for_model
 from .group import MultiFieldPanel
 from .model_utils import extract_panel_definitions_from_model_class
 
@@ -61,17 +61,32 @@ class InlinePanel(Panel):
 
     def get_form_options(self):
         child_form_opts = self.child_edit_handler.get_form_options()
+
+        formset_opts = {
+            "fields": child_form_opts.get("fields", []),
+            "widgets": child_form_opts.get("widgets", {}),
+            "min_num": self.min_num,
+            "validate_min": self.min_num is not None,
+            "max_num": self.max_num,
+            "validate_max": self.max_num is not None,
+            "formsets": child_form_opts.get("formsets"),
+        }
+
+        defer_required_on_fields = child_form_opts.get("defer_required_on_fields")
+        if defer_required_on_fields:
+            # Options inside `formsets` are processed by django-modelcluster's
+            # ClusterForm, which doesn't recognise the `defer_required_on_fields`
+            # option. Instead, we'll use get_form_for_model to build a form class
+            # with that option baked in, and pass that as the `form` option.
+            base_form = get_form_for_model(
+                self.db_field.related_model,
+                defer_required_on_fields=defer_required_on_fields,
+            )
+            formset_opts["form"] = base_form
+
         return {
             "formsets": {
-                self.relation_name: {
-                    "fields": child_form_opts.get("fields", []),
-                    "widgets": child_form_opts.get("widgets", {}),
-                    "min_num": self.min_num,
-                    "validate_min": self.min_num is not None,
-                    "max_num": self.max_num,
-                    "validate_max": self.max_num is not None,
-                    "formsets": child_form_opts.get("formsets"),
-                }
+                self.relation_name: formset_opts,
             }
         }
 
@@ -105,7 +120,9 @@ class InlinePanel(Panel):
 
                 # ditto for the ORDER field, if present
                 if self.formset.can_order:
-                    subform.fields[ORDERING_FIELD_NAME].widget = forms.HiddenInput()
+                    subform.fields[ORDERING_FIELD_NAME].widget = forms.HiddenInput(
+                        attrs={"value": index + 1}
+                    )
 
                 self.children.append(
                     self.child_edit_handler.get_bound_panel(

wagtail/admin/panels/multiple_chooser_panel.py

@@ -38,9 +38,9 @@ class MultipleChooserPanel(InlinePanel):
         def get_context_data(self, parent_context=None):
             context = super().get_context_data(parent_context)
             context["chooser_field_name"] = self.panel.chooser_field_name
-            context[
-                "chooser_widget_definition"
-            ] = self.chooser_widget_telepath_definition
+            context["chooser_widget_definition"] = (
+                self.chooser_widget_telepath_definition
+            )
             return context
 
         @property

wagtail/admin/rich_text/converters/html_to_contentstate.py

@@ -121,12 +121,12 @@ class BlockElementHandler:
         state.has_preceding_nonatomic_block = True
 
     def handle_endtag(self, name, state, contentState):
-        assert (
-            not state.current_inline_styles
-        ), "End of block reached without closing inline style elements"
-        assert (
-            not state.current_entity_ranges
-        ), "End of block reached without closing entity elements"
+        assert not state.current_inline_styles, (
+            "End of block reached without closing inline style elements"
+        )
+        assert not state.current_entity_ranges, (
+            "End of block reached without closing entity elements"
+        )
         state.current_block = None
 
 

wagtail/admin/search.py

@@ -1,5 +1,3 @@
-from warnings import warn
-
 from django.forms import Media, MediaDefiningClass
 from django.forms.utils import flatatt
 from django.template.loader import render_to_string
@@ -9,7 +7,6 @@ from django.utils.text import slugify
 
 from wagtail import hooks
 from wagtail.admin.forms.search import SearchForm
-from wagtail.utils.deprecation import RemovedInWagtail70Warning
 
 
 class SearchArea(metaclass=MediaDefiningClass):
@@ -21,19 +18,13 @@ class SearchArea(metaclass=MediaDefiningClass):
         url,
         name=None,
         classname="",
-        classnames="",
         icon_name="",
         attrs=None,
         order=1000,
     ):
-        if classnames:
-            warn(
-                "The `classnames` kwarg for SearchArea is deprecated - use `classname` instead.",
-                category=RemovedInWagtail70Warning,
-            )
         self.label = label
         self.url = url
-        self.classname = classname or classnames
+        self.classname = classname
         self.icon_name = icon_name
         self.name = name or slugify(str(label))
         self.order = order