wagtail 6.1.3__py3-none-any.whl → 6.2rc1__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, 1, 3, "final", 1)
+VERSION = (6, 2, 0, "rc", 1)
 
 __version__ = get_version(VERSION)
 

wagtail/actions/copy_for_translation.py

@@ -3,6 +3,7 @@ from django.db import transaction
 
 from wagtail.coreutils import find_available_slug
 from wagtail.models.copying import _copy
+from wagtail.signals import copy_for_translation_done
 
 
 class ParentNotTranslatedError(Exception):
@@ -79,7 +80,7 @@ class CopyPageForTranslationAction:
 
     def walk(self, current_page):
         for child_page in current_page.get_children():
-            self._copy_for_translation(
+            translated_page = self._copy_for_translation(
                 child_page
                 if child_page.live
                 else child_page.get_latest_revision_as_object(),
@@ -88,6 +89,13 @@ class CopyPageForTranslationAction:
                 self.alias,
                 self.exclude_fields,
             )
+
+            copy_for_translation_done.send(
+                sender=self.__class__,
+                source_obj=child_page.specific,
+                target_obj=translated_page,
+            )
+
             self.walk(child_page)
 
     @transaction.atomic
@@ -160,6 +168,12 @@ class CopyPageForTranslationAction:
             self.exclude_fields,
         )
 
+        copy_for_translation_done.send(
+            sender=self.__class__,
+            source_obj=self.page,
+            target_obj=translated_page,
+        )
+
         if self.include_subtree:
             self.walk(self.page)
 

wagtail/admin/checks.py

@@ -246,43 +246,33 @@ def datetime_format_check(app_configs, **kwargs):
     """
 
     from django.conf import settings
-    from django.utils import formats, translation
+    from django.utils import formats
 
     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}).",
-                        )
+        for wagtail_setting, django_setting 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_setting, None)
+            if wagtail_format_value is None:
+                # Skip the iteration if wagtail_format is not present
+                continue
+
+            input_formats = formats.get_format(django_setting, lang=code)
+            if wagtail_format_value not in input_formats:
+                errors.append(
+                    Error(
+                        "Configuration error",
+                        hint=f"'{wagtail_format_value}' must be in {django_setting} for language {label} ({code}).",
+                        obj=wagtail_setting,
+                        id="wagtailadmin.E003",
                     )
+                )
 
     return errors

wagtail/admin/forms/pages.py

@@ -125,6 +125,9 @@ class CopyForm(forms.Form):
 
 class PageViewRestrictionForm(BaseViewRestrictionForm):
     def __init__(self, *args, **kwargs):
+        # get the list of private page options from the page
+        private_page_options = kwargs.pop("private_page_options", [])
+
         super().__init__(*args, **kwargs)
 
         if not getattr(settings, "WAGTAIL_PRIVATE_PAGE_OPTIONS", {}).get(
@@ -136,6 +139,13 @@ class PageViewRestrictionForm(BaseViewRestrictionForm):
                 if choice[0] != PageViewRestriction.PASSWORD
             ]
             del self.fields["password"]
+        # Remove the fields that are not allowed for the page
+        self.fields["restriction_type"].choices = [
+            choice
+            for choice in self.fields["restriction_type"].choices
+            if choice[0] in private_page_options
+            or choice[0] == PageViewRestriction.NONE
+        ]
 
     class Meta:
         model = PageViewRestriction

wagtail/admin/icons.py

@@ -0,0 +1,43 @@
+import hashlib
+import itertools
+import re
+from functools import lru_cache
+
+from django.conf import settings
+from django.template.loader import render_to_string
+from django.urls import reverse
+
+from wagtail import hooks
+
+icon_comment_pattern = re.compile(r"<!--.*?-->")
+
+
+@lru_cache(maxsize=None)
+def get_icons():
+    icon_hooks = hooks.get_hooks("register_icons")
+    all_icons = sorted(itertools.chain.from_iterable(hook([]) for hook in icon_hooks))
+    combined_icon_markup = ""
+    for icon in all_icons:
+        symbol = (
+            render_to_string(icon)
+            .replace('xmlns="http://www.w3.org/2000/svg"', "")
+            .replace("svg", "symbol")
+        )
+        symbol = icon_comment_pattern.sub("", symbol)
+        combined_icon_markup += symbol
+
+    return render_to_string(
+        "wagtailadmin/shared/icons.html", {"icons": combined_icon_markup}
+    )
+
+
+@lru_cache(maxsize=None)
+def get_icon_sprite_hash():
+    # SECRET_KEY is used to prevent exposing the Wagtail version
+    return hashlib.sha1(
+        (get_icons() + settings.SECRET_KEY).encode("utf-8")
+    ).hexdigest()[:8]
+
+
+def get_icon_sprite_url():
+    return reverse("wagtailadmin_sprite") + f"?h={get_icon_sprite_hash()}"