wagtail 6.3.2__py3-none-any.whl → 6.4rc1__py3-none-any.whl

wagtail/admin/locale/en/LC_MESSAGES/djangojs.po

@@ -2,11 +2,11 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: src/components/Sidebar/menu/SubMenuItem.tsx:121
+#: src/components/Sidebar/menu/SubMenuItem.tsx:122
 msgid "(%(number)s new items in this menu)"
 msgstr ""
 
-#: src/components/Sidebar/menu/SubMenuItem.tsx:120
+#: src/components/Sidebar/menu/SubMenuItem.tsx:121
 msgid "(1 new item in this menu)"
 msgstr ""
 
@@ -47,7 +47,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr ""
 
-#: src/entrypoints/admin/telepath/widgets.js:407
+#: src/entrypoints/admin/telepath/widgets.js:411
 msgid "Blocks"
 msgstr ""
 
@@ -70,6 +70,7 @@ msgstr ""
 msgid "Character count:"
 msgstr ""
 
+#: src/components/Sidebar/menu/SubMenuCloseButton.tsx:30
 #: src/entrypoints/admin/modal-workflow.js:56
 msgid "Close"
 msgstr ""
@@ -144,7 +145,7 @@ msgstr ""
 msgid "Horizontal line"
 msgstr ""
 
-#: src/components/ComboBox/ComboBox.tsx:9
+#: src/components/ComboBox/ComboBox.tsx:10
 msgid "Insert a block"
 msgstr ""
 
@@ -168,7 +169,7 @@ msgstr ""
 msgid "More actions"
 msgstr ""
 
-#: src/components/ComboBox/ComboBox.tsx:11
+#: src/components/ComboBox/ComboBox.tsx:12
 #: src/components/Draftail/index.js:241
 #: src/components/PageExplorer/PageExplorerPanel.tsx:84
 msgid "No results"
@@ -191,6 +192,10 @@ msgstr ""
 msgid "Pin toolbar"
 msgstr ""
 
+#: src/components/ComboBox/ComboBox.tsx:13
+msgid "Preview"
+msgstr ""
+
 #: src/components/Draftail/EditorFallback/EditorFallback.js:96
 msgid "Reload saved content"
 msgstr ""
@@ -203,7 +208,7 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
-#: src/includes/chooserModal.js:51
+#: src/includes/chooserModal.js:53
 msgid "Report this error to your website administrator with the following information:"
 msgstr ""
 
@@ -252,7 +257,7 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: src/components/ComboBox/ComboBox.tsx:10
+#: src/components/ComboBox/ComboBox.tsx:11
 msgid "Search options…"
 msgstr ""
 
@@ -262,7 +267,7 @@ msgstr ""
 
 #: src/components/Draftail/sources/ModalWorkflowSource.js:63
 #: src/components/PageExplorer/PageExplorerPanel.tsx:112
-#: src/includes/chooserModal.js:61
+#: src/includes/chooserModal.js:63
 msgid "Server Error"
 msgstr ""
 
@@ -274,7 +279,7 @@ msgstr ""
 msgid "Show latest content"
 msgstr ""
 
-#: src/entrypoints/admin/telepath/widgets.js:298
+#: src/entrypoints/admin/telepath/widgets.js:303
 msgid "Split block"
 msgstr ""
 
@@ -282,19 +287,19 @@ msgstr ""
 msgid "The editor just crashed. Content has been reset to the last saved version."
 msgstr ""
 
-#: src/components/StreamField/blocks/ListBlock.js:196
-#: src/components/StreamField/blocks/StreamBlock.js:271
-#: src/components/StreamField/blocks/StreamBlock.js:295
+#: src/components/StreamField/blocks/ListBlock.js:202
+#: src/components/StreamField/blocks/StreamBlock.js:277
+#: src/components/StreamField/blocks/StreamBlock.js:301
 msgid "The maximum number of items is %(max_num)d"
 msgstr ""
 
-#: src/components/StreamField/blocks/ListBlock.js:207
-#: src/components/StreamField/blocks/StreamBlock.js:279
-#: src/components/StreamField/blocks/StreamBlock.js:309
+#: src/components/StreamField/blocks/ListBlock.js:213
+#: src/components/StreamField/blocks/StreamBlock.js:285
+#: src/components/StreamField/blocks/StreamBlock.js:315
 msgid "The minimum number of items is %(min_num)d"
 msgstr ""
 
-#: src/includes/chooserModal.js:21
+#: src/includes/chooserModal.js:23
 msgid "This field is required."
 msgstr ""
 

wagtail/admin/menu.py

@@ -43,9 +43,6 @@ class MenuItem(metaclass=MediaDefiningClass):
         """
         return True
 
-    def is_active(self, request):
-        return request.path.startswith(str(self.url))
-
     def render_component(self, request):
         return LinkMenuItemComponent(
             self.name,
@@ -121,13 +118,6 @@ class Menu:
 
         return items
 
-    def active_menu_items(self, request):
-        return [
-            item
-            for item in self.menu_items_for_request(request)
-            if item.is_active(request)
-        ]
-
     @property
     def media(self):
         media = Media()
@@ -154,9 +144,6 @@ class SubmenuMenuItem(MenuItem):
         # show the submenu if one or more of its children is shown
         return bool(self.menu.menu_items_for_request(request))
 
-    def is_active(self, request):
-        return bool(self.menu.active_menu_items(request))
-
     def render_component(self, request):
         return SubMenuItemComponent(
             self.name,

wagtail/admin/panels/base.py

@@ -57,8 +57,8 @@ class Panel:
     with the field list and other parameters collated from all panels in the structure.
     It then handles rendering that form as HTML.
 
-    The following parameters can be used to customise how the panel is displayed.
-    For more details, see :ref:`customising_panels`.
+    The following parameters can be used to customize how the panel is displayed.
+    For more details, see :ref:`customizing_panels`.
 
     :param heading: The heading text to display for the panel.
     :param classname: A CSS class name to add to the panel's HTML element.

wagtail/admin/panels/group.py

@@ -71,7 +71,10 @@ class PanelGroup(Panel):
         return options
 
     def on_model_bound(self):
-        self.children = [child.bind_to_model(self.model) for child in self.children]
+        from .model_utils import expand_panel_list
+
+        child_panels = expand_panel_list(self.model, self.children)
+        self.children = [child.bind_to_model(self.model) for child in child_panels]
 
     @cached_property
     def child_identifiers(self):

wagtail/admin/panels/inline_panel.py

@@ -3,6 +3,7 @@ import functools
 from django import forms
 from django.forms.formsets import DELETION_FIELD_NAME, ORDERING_FIELD_NAME
 from django.utils.functional import cached_property
+from django.utils.text import capfirst
 
 from wagtail.admin import compare
 
@@ -26,7 +27,7 @@ class InlinePanel(Panel):
         super().__init__(*args, **kwargs)
         self.relation_name = relation_name
         self.panels = panels
-        self.heading = heading or label
+        self.heading = heading or label or capfirst(relation_name.replace("_", " "))
         self.label = label
         self.min_num = min_num
         self.max_num = max_num
@@ -77,6 +78,8 @@ class InlinePanel(Panel):
     def on_model_bound(self):
         manager = getattr(self.model, self.relation_name)
         self.db_field = manager.rel
+        if not self.label:
+            self.label = capfirst(self.db_field.related_model._meta.verbose_name)
 
     def classes(self):
         return super().classes() + ["w-panel--nested"]
@@ -150,7 +153,7 @@ class InlinePanel(Panel):
                     compare.ChildRelationComparison,
                     self.panel.db_field,
                     field_comparisons,
-                    label=self.label,
+                    label=self.heading,
                 )
             ]
 

wagtail/admin/panels/model_utils.py

@@ -1,9 +1,13 @@
 import functools
 
+from django.core.exceptions import ImproperlyConfigured
+from django.db.models.fields.reverse_related import ManyToOneRel
 from django.forms.models import fields_for_model
 
 from wagtail.admin.forms.models import formfield_for_dbfield
+from wagtail.models import PanelPlaceholder
 
+from .base import Panel
 from .field_panel import FieldPanel
 from .group import ObjectList
 
@@ -47,3 +51,35 @@ def get_edit_handler(model):
         panel = ObjectList(panels)
 
     return panel.bind_to_model(model)
+
+
+def expand_panel_list(model, panels):
+    """
+    Given a list which may be a mixture of Panel instances and strings (representing field/relation names),
+    expand it into a flat list of Panel instances
+    """
+    result = []
+    for panel in panels:
+        if isinstance(panel, Panel):
+            result.append(panel)
+
+        elif isinstance(panel, PanelPlaceholder):
+            if real_panel := panel.construct():
+                result.append(real_panel)
+
+        elif isinstance(panel, str):
+            field = model._meta.get_field(panel)
+            if isinstance(field, ManyToOneRel):
+                from .inline_panel import InlinePanel
+
+                result.append(InlinePanel(panel))
+            else:
+                result.append(FieldPanel(panel))
+
+        else:
+            raise ImproperlyConfigured(
+                "Invalid panel definition %r - expected Panel or string, got %r"
+                % (panel, type(panel))
+            )
+
+    return result

wagtail/admin/panels/page_utils.py

@@ -1,50 +1,12 @@
-from django.conf import settings
 from django.utils.translation import gettext_lazy
 
 from wagtail.admin.forms.pages import WagtailAdminPageForm
 from wagtail.models import Page
 from wagtail.utils.decorators import cached_classmethod
 
-from .comment_panel import CommentPanel
-from .field_panel import FieldPanel
-from .group import MultiFieldPanel, ObjectList, TabbedInterface
-from .publishing_panel import PublishingPanel
-from .title_field_panel import TitleFieldPanel
+from .group import ObjectList, TabbedInterface
 
-
-def set_default_page_edit_handlers(cls):
-    cls.content_panels = [
-        TitleFieldPanel("title"),
-    ]
-
-    cls.promote_panels = [
-        MultiFieldPanel(
-            [
-                FieldPanel("slug"),
-                FieldPanel("seo_title"),
-                FieldPanel("search_description"),
-            ],
-            gettext_lazy("For search engines"),
-        ),
-        MultiFieldPanel(
-            [
-                FieldPanel("show_in_menus"),
-            ],
-            gettext_lazy("For site menus"),
-        ),
-    ]
-
-    cls.settings_panels = [
-        PublishingPanel(),
-    ]
-
-    if getattr(settings, "WAGTAILADMIN_COMMENTS_ENABLED", True):
-        cls.settings_panels.append(CommentPanel())
-
-    cls.base_form_class = WagtailAdminPageForm
-
-
-set_default_page_edit_handlers(Page)
+Page.base_form_class = WagtailAdminPageForm
 
 
 @cached_classmethod

wagtail/admin/panels/signal_handlers.py

@@ -5,7 +5,6 @@ from django.dispatch import receiver
 from wagtail.models import Page
 
 from .model_utils import get_edit_handler
-from .page_utils import set_default_page_edit_handlers
 
 
 @receiver(setting_changed)
@@ -14,7 +13,6 @@ def reset_edit_handler_cache(**kwargs):
     Clear page edit handler cache when global WAGTAILADMIN_COMMENTS_ENABLED settings are changed
     """
     if kwargs["setting"] == "WAGTAILADMIN_COMMENTS_ENABLED":
-        set_default_page_edit_handlers(Page)
         for model in apps.get_models():
             if issubclass(model, Page):
                 model.get_edit_handler.cache_clear()