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

wagtail/actions/copy_for_translation.py

@@ -107,9 +107,11 @@ class CopyPageForTranslationAction:
         if not parent.is_root():
             try:
                 translated_parent = parent.get_translation(locale)
-            except parent.__class__.DoesNotExist:
+            except parent.__class__.DoesNotExist as e:
                 if not copy_parents:
-                    raise ParentNotTranslatedError("Parent page is not translated.")
+                    raise ParentNotTranslatedError(
+                        "Parent page is not translated."
+                    ) from e
 
                 translated_parent = parent.copy_for_translation(
                     locale, copy_parents=True, alias=True

wagtail/admin/action_menu.py

@@ -4,6 +4,7 @@ from django.conf import settings
 from django.forms import Media
 from django.template.loader import render_to_string
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 
@@ -89,7 +90,9 @@ class PublishMenuItem(ActionMenuItem):
     def get_context_data(self, parent_context):
         context = super().get_context_data(parent_context)
         page = context.get("page")
-        context["is_scheduled"] = page and page.go_live_at
+        context["is_scheduled"] = (
+            page and page.go_live_at and page.go_live_at > timezone.now()
+        )
         context["is_revision"] = context["view"] == "revisions_revert"
         return context
 

wagtail/admin/api/actions/convert_alias.py

@@ -22,9 +22,9 @@ class ConvertAliasPageAPIAction(APIAction):
         try:
             new_page = action.execute()
         except DjangoValidationError as e:
-            raise ValidationError(e.message_dict)
+            raise ValidationError(e.message_dict) from e
         except ConvertAliasPageError as e:
-            raise BadRequestError(e.args[0])
+            raise BadRequestError(e.args[0]) from e
 
         serializer = self.view.get_serializer(new_page)
         return Response(serializer.data, status=status.HTTP_200_OK)

wagtail/admin/api/actions/copy.py

@@ -59,9 +59,9 @@ class CopyPageAPIAction(APIAction):
         try:
             new_page = action.execute()
         except DjangoValidationError as e:
-            raise ValidationError(e.message_dict)
+            raise ValidationError(e.message_dict) from e
         except CopyPageIntegrityError as e:
-            raise BadRequestError(e.args[0])
+            raise BadRequestError(e.args[0]) from e
 
         serializer = self.view.get_serializer(new_page)
         return Response(serializer.data, status=status.HTTP_201_CREATED)

wagtail/admin/api/actions/copy_for_translation.py

@@ -43,9 +43,9 @@ class CopyForTranslationAPIAction(APIAction):
         try:
             translated_page = action.execute()
         except DjangoValidationError as e:
-            raise ValidationError(e.message_dict)
+            raise ValidationError(e.message_dict) from e
         except ParentNotTranslatedError as e:
-            raise BadRequestError(e.args[0])
+            raise BadRequestError(e.args[0]) from e
 
         serializer = self.view.get_serializer(translated_page)
         return Response(serializer.data, status=status.HTTP_201_CREATED)

wagtail/admin/api/actions/create_alias.py

@@ -43,9 +43,9 @@ class CreatePageAliasAPIAction(APIAction):
         try:
             new_page = action.execute()
         except DjangoValidationError as e:
-            raise ValidationError(e.message_dict)
+            raise ValidationError(e.message_dict) from e
         except CreatePageAliasIntegrityError as e:
-            raise BadRequestError(e.args[0])
+            raise BadRequestError(e.args[0]) from e
 
         serializer = self.view.get_serializer(new_page)
         return Response(serializer.data, status=status.HTTP_201_CREATED)

wagtail/admin/api/actions/delete.py

@@ -21,6 +21,6 @@ class DeletePageAPIAction(APIAction):
         try:
             action.execute()
         except DjangoValidationError as e:
-            raise ValidationError(e.message_dict)
+            raise ValidationError(e.message_dict) from e
 
         return Response(status=status.HTTP_204_NO_CONTENT)

wagtail/admin/api/actions/move.py

@@ -46,7 +46,7 @@ class MovePageAPIAction(APIAction):
         try:
             action.execute()
         except DjangoValidationError as e:
-            raise ValidationError(e.message_dict)
+            raise ValidationError(e.message_dict) from e
 
         instance.refresh_from_db()
         serializer = self.view.get_serializer(instance)

wagtail/admin/api/actions/publish.py

@@ -22,12 +22,12 @@ class PublishPageAPIAction(APIAction):
         try:
             action = self._action_from_data(instance, data)
         except RuntimeError as e:
-            raise BadRequestError(e.args[0])
+            raise BadRequestError(e.args[0]) from e
 
         try:
             action.execute()
         except DjangoValidationError as e:
-            raise ValidationError(e.message_dict)
+            raise ValidationError(e.message_dict) from e
 
         new_page = instance.specific_class.objects.get(pk=instance.pk)
         serializer = self.view.get_serializer(new_page)

wagtail/admin/api/actions/revert_to_page_revision.py

@@ -34,9 +34,9 @@ class RevertToPageRevisionAPIAction(APIAction):
         try:
             new_revision = action.execute()
         except DjangoValidationError as e:
-            raise ValidationError(e.message_dict)
+            raise ValidationError(e.message_dict) from e
         except RevertToPageRevisionError as e:
-            raise BadRequestError(e.args[0])
+            raise BadRequestError(e.args[0]) from e
 
         serializer = self.view.get_serializer(new_revision.as_object())
         return Response(serializer.data, status=status.HTTP_200_OK)

wagtail/admin/api/actions/unpublish.py

@@ -29,7 +29,7 @@ class UnpublishPageAPIAction(APIAction):
         try:
             action.execute()
         except DjangoValidationError as e:
-            raise ValidationError(e.message_dict)
+            raise ValidationError(e.message_dict) from e
 
         serializer = self.view.get_serializer(instance)
         return Response(serializer.data, status=status.HTTP_200_OK)

wagtail/admin/api/filters.py

@@ -15,8 +15,8 @@ class HasChildrenFilter(BaseFilterBackend):
         if "has_children" in request.GET:
             try:
                 has_children_filter = parse_boolean(request.GET["has_children"])
-            except ValueError:
-                raise BadRequestError("has_children must be 'true' or 'false'")
+            except ValueError as e:
+                raise BadRequestError("has_children must be 'true' or 'false'") from e
 
             if has_children_filter is True:
                 return queryset.filter(numchild__gt=0)

wagtail/admin/compare.py

@@ -308,6 +308,28 @@ class StreamBlockComparison(BaseSequenceBlockComparison):
     def get_block_comparisons(self):
         return self.get_block_comparisons_by_id()
 
+    def htmlvalue(self, val):
+        htmlvalues = []
+
+        for stream_child in self.get_blocks_from_value(val):
+            block = stream_child.block
+            label = block.label
+            comparison_class = get_comparison_class_for_block(block)
+
+            htmlvalues.append(
+                (
+                    label,
+                    comparison_class(
+                        block, True, True, stream_child.value, stream_child.value
+                    ).htmlvalue(stream_child.value),
+                )
+            )
+
+        return format_html(
+            "<dl>\n{}\n</dl>",
+            format_html_join("\n", "    <dt>{}</dt>\n    <dd>{}</dd>", htmlvalues),
+        )
+
 
 class ListBlockComparison(BaseSequenceBlockComparison):
     @staticmethod

wagtail/admin/forms/account.py

@@ -1,10 +1,14 @@
+import io
+import os
 import warnings
 
 from django import forms
 from django.conf import settings
 from django.contrib.auth import get_user_model
+from django.core.files.uploadedfile import InMemoryUploadedFile
 from django.utils.translation import get_language_info
 from django.utils.translation import gettext_lazy as _
+from PIL import Image
 
 from wagtail.admin.localization import (
     get_available_admin_languages,
@@ -125,6 +129,53 @@ class AvatarPreferencesForm(forms.ModelForm):
         super().__init__(*args, **kwargs)
         self._original_avatar = self.instance.avatar
 
+    def clean_avatar(self):
+        file = self.cleaned_data.get("avatar")
+        if not file:
+            return self._original_avatar
+
+        image = Image.open(file)
+        width, height = image.size
+
+        if width <= 400 and height <= 400:
+            return file
+
+        target_size = 400
+
+        if width > height:
+            new_width = target_size
+            new_height = int(height * (target_size / width))
+        else:
+            new_height = target_size
+            new_width = int(width * (target_size / height))
+
+        resized_image = image.resize((new_width, new_height))
+
+        orig_format = image.format or "JPEG"
+
+        output = io.BytesIO()
+        resized_image.save(output, format=image.format)
+        output.seek(0)
+
+        new_ext = (
+            "jpg" if orig_format.upper() in ("JPEG", "JPG") else orig_format.lower()
+        )
+        content_type = f"image/{'jpeg' if new_ext == 'jpg' else new_ext}"
+
+        base_name, _ = os.path.splitext(file.name)
+        filename = f"{base_name}.{new_ext}"
+
+        new_file = InMemoryUploadedFile(
+            file=output,
+            field_name="avatar",
+            name=filename,
+            content_type=content_type,
+            size=output.getbuffer().nbytes,
+            charset=None,
+        )
+
+        return new_file
+
     def save(self, commit=True):
         if (
             commit
@@ -140,7 +191,7 @@ class AvatarPreferencesForm(forms.ModelForm):
                 warnings.warn(
                     "Failed to delete old avatar file: %s" % self._original_avatar.name
                 )
-        super().save(commit=commit)
+        return super().save(commit=commit)
 
     class Meta:
         model = UserProfile

wagtail/admin/forms/comments.py

@@ -1,7 +1,11 @@
+from django.contrib.auth import get_user_model
 from django.forms import BooleanField, ValidationError
 from django.utils.timezone import now
 from django.utils.translation import gettext as _
 from modelcluster.forms import BaseChildFormSet
+from modelcluster.models import get_serializable_data_for_fields
+
+from wagtail.admin.templatetags.wagtailadmin_tags import avatar_url, user_display_name
 
 from .models import WagtailAdminModelForm
 
@@ -26,6 +30,11 @@ class CommentReplyForm(WagtailAdminModelForm):
                 )
         return cleaned_data
 
+    def serialize(self, bound):
+        data = get_serializable_data_for_fields(self.instance)
+        data["deleted"] = self.cleaned_data.get("DELETE", False) if bound else False
+        return data, {self.instance.user_id}
+
 
 class CommentForm(WagtailAdminModelForm):
     """
@@ -75,6 +84,24 @@ class CommentForm(WagtailAdminModelForm):
             self.instance.resolved_at = None
         return super().save(*args, **kwargs)
 
+    def serialize(self, bound):
+        user_pks = {self.instance.user_id}
+        replies = []
+        for reply_form in self.formsets["replies"].forms:
+            reply_data, reply_user_pks = reply_form.serialize(bound)
+            replies.append(reply_data)
+            user_pks.update(reply_user_pks)
+
+        data = get_serializable_data_for_fields(self.instance)
+        data["deleted"] = self.cleaned_data.get("DELETE", False) if bound else False
+        data["resolved"] = (
+            self.cleaned_data.get("resolved", False)
+            if bound
+            else self.instance.resolved_at is not None
+        )
+        data["replies"] = replies
+        return data, user_pks
+
 
 class CommentFormSet(BaseChildFormSet):
     def __init__(self, *args, **kwargs):
@@ -85,3 +112,29 @@ class CommentFormSet(BaseChildFormSet):
             if comment.has_valid_contentpath(self.instance)
         ]
         self.queryset = self.queryset.filter(id__in=valid_comment_ids)
+
+    def serialize(self, bound: bool, user):
+        def user_data(user):
+            return {"name": user_display_name(user), "avatar_url": avatar_url(user)}
+
+        user_pks = {user.pk}
+        serialized_comments = []
+        for form in self.forms:
+            # iterate over comments to retrieve users (to get display names) and serialized versions
+            data, comment_user_pks = form.serialize(bound)
+            serialized_comments.append(data)
+            user_pks.update(comment_user_pks)
+
+        authors = {
+            str(user.pk): user_data(user)
+            for user in get_user_model()
+            .objects.filter(pk__in=user_pks)
+            .select_related("wagtail_userprofile")
+        }
+
+        comments_data = {
+            "comments": serialized_comments,
+            "user": user.pk,
+            "authors": authors,
+        }
+        return comments_data

wagtail/admin/forms/models.py

@@ -170,6 +170,42 @@ class WagtailAdminModelForm(
             self.fields[field_name].required = True
         self.deferred_required_fields = []
 
+    def get_field_updates_for_resave(self):
+        """
+        Following a successful save (as a background HTTP request), returns a list of
+        form field updates - as (name, new_value) tuples - that can be applied to the
+        form in the still-open page to make it valid for subsequent submissions. This
+        includes populating the IDs of child objects within formsets - without this,
+        subsequent submissions would create duplicates of these objects.
+        """
+        updates = []
+        for formset in self.formsets.values():
+            if formset.total_form_count() != formset.initial_form_count():
+                updates.append(
+                    (
+                        f"{formset.management_form.prefix}-INITIAL_FORMS",
+                        str(formset.total_form_count()),
+                    )
+                )
+
+            for form in formset.forms:
+                id_field_name = f"{form.prefix}-id"
+
+                if formset.can_delete and formset._should_delete_form(form):
+                    if self.data.get(id_field_name):
+                        # Form will remain in the formset as a deleted form;
+                        # clear its ID so that it's skipped over on next submission
+                        # like an added-and-immediately-deleted form would be
+                        updates.append((id_field_name, ""))
+                else:
+                    updates.extend(form.get_field_updates_for_resave())
+                    if form.instance.pk and not self.data.get(id_field_name):
+                        # instance has a PK but the form data doesn't include it - it must have
+                        # been created during the save we just performed
+                        updates.append((id_field_name, str(form.instance.pk)))
+
+        return updates
+
     class Meta:
         formfield_callback = formfield_for_dbfield
 

wagtail/admin/forms/pages.py

@@ -205,6 +205,13 @@ class WagtailAdminPageForm(WagtailAdminModelForm):
             del self.formsets["comments"]
         return super().is_valid()
 
+    def serialize_comments(self, user):
+        if comments := self.formsets.get("comments"):
+            data = comments.serialize(self.is_bound, user)
+        else:
+            data = {"comments": [], "user": user.pk, "authors": {}}
+        return data
+
     def clean(self):
         cleaned_data = super().clean()
         if "slug" in self.cleaned_data:

wagtail/admin/forms/workflows.py

@@ -179,7 +179,7 @@ class WorkflowContentTypeForm(forms.Form):
 
     def __init__(self, *args, workflow=None, **kwargs):
         self.workflow = workflow
-        if workflow and "initial" not in kwargs:
+        if workflow and workflow.pk and "initial" not in kwargs:
             kwargs["initial"] = {"content_types": workflow.workflow_content_types.all()}
 
         super().__init__(*args, **kwargs)
@@ -206,7 +206,10 @@ class WorkflowContentTypeForm(forms.Form):
         existing_assignments = WorkflowContentType.objects.filter(
             content_type__in=content_types,
             workflow__active=True,
-        ).exclude(workflow=self.workflow)
+        )
+        if self.workflow.pk:
+            existing_assignments = existing_assignments.exclude(workflow=self.workflow)
+
         for assignment in existing_assignments:
             self.add_error(
                 "content_types",

wagtail/admin/icons.py

@@ -1,5 +1,4 @@
 import hashlib
-import itertools
 import re
 from functools import lru_cache
 
@@ -13,8 +12,10 @@ icon_comment_pattern = re.compile(r"<!--.*?-->", re.DOTALL)
 
 @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))
+    all_icons = []
+    for fn in hooks.get_hooks("register_icons"):
+        all_icons = fn(all_icons)
+    all_icons = sorted(all_icons)
     combined_icon_markup = ""
     for icon in all_icons:
         symbol = (

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

@@ -89,6 +89,9 @@ msgstr "واجهة إدارة Wagtail"
 msgid "Sorry, you do not have permission to access this area."
 msgstr "عذرًا، ليس لديك صلاحية للوصول إلى هذه المنطقة."
 
+msgid "You do not have permission to access the admin."
+msgstr "ليس لديك صلاحية للوصول لواجهة الإدارة"
+
 msgid "None"
 msgstr "لا شيء"
 
@@ -98,12 +101,21 @@ msgstr "التاريخ من"
 msgid "Date to"
 msgstr "التاريخ إلى"
 
+msgid "Minimum"
+msgstr "الحد الأدنى"
+
+msgid "Maximum"
+msgstr "الحد الأقصى"
+
 msgid "Locale"
 msgstr "الإعدادات المحلية"
 
 msgid "All"
 msgstr "الكل"
 
+msgid "Usage count"
+msgstr "عدد الاستخدام"
+
 msgid "Collection"
 msgstr "رزمة"
 
@@ -174,6 +186,9 @@ msgstr ""
 "اختر الموقع الهرمي. ملاحظة: لا يمكن أن تصبح الرزمة فرعًا لنفسها أو لأحد "
 "فروعها."
 
+msgid "Please select another parent."
+msgstr "الرجاء اختيار أصل آخر"
+
 msgid "You cannot have multiple permission records for the same collection."
 msgstr "لا يمكن أن يكون لديك سجلات صلاحيات متعددة لنفس الرزمة."
 
@@ -2179,6 +2194,9 @@ msgstr "رجوع"
 msgid "History"
 msgstr "السجل"
 
+msgid "account"
+msgstr "الحساب"
+
 msgid "Keyboard shortcuts"
 msgstr "اختصارات لوحة المفاتيح"
 
@@ -3293,6 +3311,9 @@ msgstr "صفحة '%(page_title)s' تم إنشاؤها ونشرها."
 msgid "Page '%(page_title)s' created and submitted for moderation."
 msgstr "صفحة '%(page_title)s' تم إنشاؤها وتقديمها للإشراف."
 
+msgid "The page could not be created due to validation errors."
+msgstr "لا يمكن إنشاء الصفحة بسبب أخطاء التحقق من الصحة"
+
 #, python-format
 msgid "Page '%(page_title)s' deleted."
 msgstr "الصفحة '%(page_title)s' محذوفة."
@@ -3350,6 +3371,12 @@ msgstr "الصفحة '%(page_title)s' تم تقديمها للإشراف."
 msgid "Workflow on page '%(page_title)s' has been restarted."
 msgstr "تم إعادة تشغيل سير العمل على الصفحة '%(page_title)s'."
 
+msgid "The page could not be saved as it is locked."
+msgstr "لا يمكن حفظ الصفحة لأنها مقفلة"
+
+msgid "The page could not be saved due to validation errors."
+msgstr "لا يمكن حفظ الصفحة بسبب أخطاء التحقق من الصحة"
+
 msgid "Is commenting action"
 msgstr "إجراء التعليق"
 
@@ -3384,6 +3411,14 @@ msgstr "استكشاف"
 msgid "Page '%(page_title)s' is now unlocked."
 msgstr "الصفحة '%(page_title)s' غير مقفلة الآن."
 
+#, python-format
+msgid ""
+"The slug '%(page_slug)s' is already in use at the selected parent page. Make "
+"sure the slug is unique and try again."
+msgstr ""
+"الرابط '%(page_slug)s' مستخدم بالفعل في الصفحة الأصل المحددة. تأكد من أن "
+"الرابط فريد وحاول مرة أخرى"
+
 #, python-format
 msgid "Page '%(page_title)s' moved."
 msgstr "تم نقل الصفحة '%(page_title)s'."