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

wagtail/documents/wagtail_hooks.py

@@ -1,7 +1,8 @@
+from warnings import warn
+
 from django.conf import settings
 from django.template.response import TemplateResponse
-from django.urls import include, path, reverse
-from django.utils.html import format_html
+from django.urls import include, path, reverse, reverse_lazy
 from django.utils.translation import gettext, ngettext
 from django.utils.translation import gettext_lazy as _
 
@@ -31,6 +32,7 @@ from wagtail.documents.views.bulk_actions import (
 )
 from wagtail.documents.views.chooser import viewset as chooser_viewset
 from wagtail.models import BaseViewRestriction
+from wagtail.utils.deprecation import RemovedInWagtail70Warning
 from wagtail.wagtail_hooks import require_wagtail_login
 
 
@@ -64,18 +66,6 @@ def register_documents_menu_item():
     )
 
 
-@hooks.register("insert_editor_js")
-def editor_js():
-    return format_html(
-        """
-        <script>
-            window.chooserUrls.documentChooser = '{0}';
-        </script>
-        """,
-        reverse("wagtaildocs_chooser:choose"),
-    )
-
-
 @hooks.register("register_rich_text_features")
 def register_document_feature(features):
     features.register_link_type(DocumentLinkHandler)
@@ -88,6 +78,9 @@ def register_document_feature(features):
                 "type": "DOCUMENT",
                 "icon": "doc-full-inverse",
                 "description": gettext("Document"),
+                "chooserUrls": {
+                    "documentChooser": reverse_lazy("wagtaildocs_chooser:choose")
+                },
             },
             js=["wagtaildocs/js/document-chooser-modal.js"],
         ),
@@ -190,10 +183,22 @@ def check_view_restrictions(document, request):
 
                 password_required_template = getattr(
                     settings,
-                    "DOCUMENT_PASSWORD_REQUIRED_TEMPLATE",
+                    "WAGTAILDOCS_PASSWORD_REQUIRED_TEMPLATE",
                     "wagtaildocs/password_required.html",
                 )
 
+                if hasattr(settings, "DOCUMENT_PASSWORD_REQUIRED_TEMPLATE"):
+                    warn(
+                        "The `DOCUMENT_PASSWORD_REQUIRED_TEMPLATE` setting is deprecated - use `WAGTAILDOCS_PASSWORD_REQUIRED_TEMPLATE` instead.",
+                        category=RemovedInWagtail70Warning,
+                    )
+
+                    password_required_template = getattr(
+                        settings,
+                        "DOCUMENT_PASSWORD_REQUIRED_TEMPLATE",
+                        password_required_template,
+                    )
+
                 context = {"form": form, "action_url": action_url}
                 return TemplateResponse(request, password_required_template, context)
 

wagtail/embeds/blocks.py

@@ -85,5 +85,10 @@ class EmbedBlock(blocks.URLBlock):
             raise ValidationError(_("Cannot find an embed for this URL."))
         return super().clean(value)
 
+    def normalize(self, value):
+        if isinstance(value, EmbedValue):
+            return value
+        return EmbedValue(value)
+
     class Meta:
         icon = "media"

wagtail/embeds/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-04-18 17:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,6 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: wagtail_hooks.py:51
+#: wagtail_hooks.py:38
 msgid "Embed"
 msgstr ""

wagtail/embeds/rich_text/__init__.py

@@ -18,7 +18,7 @@ class MediaEmbedHandler(EmbedHandler):
         return get_embed(attrs["url"])
 
     @staticmethod
-    def expand_db_attributes(attrs):
+    def expand_db_attributes(attrs: dict) -> str:
         """
         Given a dict of attributes from the <embed> tag, return the real HTML
         representation for use on the front-end.

wagtail/embeds/tests/test_rich_text.py

@@ -1,6 +1,7 @@
 from unittest.mock import patch
 
 from django.test import TestCase, override_settings
+from django.urls import reverse_lazy
 
 from wagtail.embeds.exceptions import EmbedNotFoundException
 from wagtail.embeds.models import Embed
@@ -9,6 +10,7 @@ from wagtail.embeds.rich_text.editor_html import (
     MediaEmbedHandler as EditorHtmlMediaEmbedHandler,
 )
 from wagtail.rich_text import expand_db_html
+from wagtail.rich_text.feature_registry import FeatureRegistry
 from wagtail.test.utils import WagtailTestUtils
 
 
@@ -143,3 +145,15 @@ class TestFrontendMediaEmbedHandler(TestCase):
         get_embed.assert_called_with(
             "https://www.youtube.com/watch?v=O7D-1RG-VRk&t=25", None, None
         )
+
+
+class TestEntityFeatureChooserUrls(TestCase):
+    def test_chooser_urls_exist(self):
+        features = FeatureRegistry()
+        embed = features.get_editor_plugin("draftail", "embed")
+
+        self.assertIsNotNone(embed.data.get("chooserUrls"))
+        self.assertEqual(
+            embed.data["chooserUrls"]["embedsChooser"],
+            reverse_lazy("wagtailembeds:chooser"),
+        )

wagtail/embeds/wagtail_hooks.py

@@ -1,5 +1,4 @@
-from django.urls import include, path, reverse
-from django.utils.html import format_html
+from django.urls import include, path, reverse_lazy
 from django.utils.translation import gettext as _
 
 import wagtail.admin.rich_text.editors.draftail.features as draftail_features
@@ -17,18 +16,6 @@ def register_admin_urls():
     ]
 
 
-@hooks.register("insert_editor_js")
-def editor_js():
-    return format_html(
-        """
-            <script>
-                window.chooserUrls.embedsChooser = '{0}';
-            </script>
-        """,
-        reverse("wagtailembeds:chooser"),
-    )
-
-
 @hooks.register("register_rich_text_features")
 def register_embed_feature(features):
     # define a handler for converting <embed embedtype="media"> tags into frontend HTML
@@ -49,6 +36,9 @@ def register_embed_feature(features):
                 "type": "EMBED",
                 "icon": "media",
                 "description": _("Embed"),
+                "chooserUrls": {
+                    "embedsChooser": reverse_lazy("wagtailembeds:chooser"),
+                },
             },
             js=["wagtailembeds/js/embed-chooser-modal.js"],
         ),

wagtail/fields.py

@@ -131,59 +131,14 @@ class StreamField(models.Field):
         return name, path, args, kwargs
 
     def to_python(self, value):
-        value = self._to_python(value)
+        result = self.stream_block.to_python(value)
 
         # The top-level StreamValue is passed a reference to the StreamField, to support
         # pickling. This is necessary because unpickling needs access to the StreamBlock
         # definition, which cannot itself be pickled; instead we store a pointer to the
         # field within the model, which gives us a path to retrieve the StreamBlock definition.
-
-        value._stream_field = self
-        return value
-
-    def _to_python(self, value):
-        if value is None or value == "":
-            return StreamValue(self.stream_block, [])
-        elif isinstance(value, StreamValue):
-            return value
-        elif isinstance(value, str):
-            try:
-                unpacked_value = json.loads(value)
-            except ValueError:
-                # value is not valid JSON; most likely, this field was previously a
-                # rich text field before being migrated to StreamField, and the data
-                # was left intact in the migration. Return an empty stream instead
-                # (but keep the raw text available as an attribute, so that it can be
-                # used to migrate that data to StreamField)
-                return StreamValue(self.stream_block, [], raw_text=value)
-
-            if unpacked_value is None:
-                # we get here if value is the literal string 'null'. This should probably
-                # never happen if the rest of the (de)serialization code is working properly,
-                # but better to handle it just in case...
-                return StreamValue(self.stream_block, [])
-
-            return self.stream_block.to_python(unpacked_value)
-        elif value and isinstance(value, list) and isinstance(value[0], dict):
-            # The value is already unpacked since JSONField-based StreamField should
-            # accept deserialised values (no need to call json.dumps() first).
-            # In addition, the value is not a list of (block_name, value) tuples
-            # handled in the `else` block.
-            return self.stream_block.to_python(value)
-        else:
-            # See if it looks like the standard non-smart representation of a
-            # StreamField value: a list of (block_name, value) tuples
-            try:
-                [None for (x, y) in value]
-            except (TypeError, ValueError):
-                # Give up trying to make sense of the value
-                raise TypeError(
-                    "Cannot handle %r (type %r) as a value of StreamField"
-                    % (value, type(value))
-                )
-
-            # Test succeeded, so return as a StreamValue-ified version of that value
-            return StreamValue(self.stream_block, value)
+        result._stream_field = self
+        return result
 
     def get_prep_value(self, value):
         if (

wagtail/images/admin_urls.py

@@ -24,7 +24,7 @@ urlpatterns = [
     path("multiple/add/", multiple.AddView.as_view(), name="add_multiple"),
     path("multiple/<int:image_id>/", multiple.EditView.as_view(), name="edit_multiple"),
     path(
-        "multiple/create_from_uploaded_image/<int:uploaded_image_id>/",
+        "multiple/create_from_uploaded_image/<int:uploaded_file_id>/",
         multiple.CreateFromUploadedImageView.as_view(),
         name="create_multiple_from_uploaded_image",
     ),
@@ -34,7 +34,7 @@ urlpatterns = [
         name="delete_multiple",
     ),
     path(
-        "multiple/delete_upload/<int:uploaded_image_id>/",
+        "multiple/delete_upload/<int:uploaded_file_id>/",
         multiple.DeleteUploadView.as_view(),
         name="delete_upload_multiple",
     ),

wagtail/images/fields.py

@@ -205,5 +205,7 @@ def image_format_name_to_content_type(image_format_name):
         return "image/webp"
     elif image_format_name == "avif":
         return "image/avif"
+    elif image_format_name == "ico":
+        return "image/x-icon"
     else:
         raise ValueError("Unknown image format name")

wagtail/images/image_operations.py

@@ -409,7 +409,7 @@ class WebPQualityOperation(FilterOperation):
 
 
 class FormatOperation(FilterOperation):
-    supported_formats = ["jpeg", "png", "gif", "webp", "avif"]
+    supported_formats = ["jpeg", "png", "gif", "webp", "avif", "ico"]
 
     def construct(self, format, *options):
         self.format = format

wagtail/images/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-04-18 17:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Add/edit images you own"
 msgstr ""
 
-#: forms.py:202 views/images.py:382
+#: forms.py:202 views/images.py:353
 msgid "Edit"
 msgstr ""
 
@@ -160,39 +160,39 @@ msgstr ""
 msgid "Select images in choosers"
 msgstr ""
 
-#: models.py:243
+#: models.py:254
 msgid "title"
 msgstr ""
 
-#: models.py:246
+#: models.py:257
 msgid "file"
 msgstr ""
 
-#: models.py:251
+#: models.py:262
 msgid "width"
 msgstr ""
 
-#: models.py:252
+#: models.py:263
 msgid "height"
 msgstr ""
 
-#: models.py:254
+#: models.py:265
 msgid "created at"
 msgstr ""
 
-#: models.py:258 models.py:1337
+#: models.py:269
 msgid "uploaded by user"
 msgstr ""
 
-#: models.py:266
+#: models.py:277
 msgid "tags"
 msgstr ""
 
-#: models.py:824
+#: models.py:853
 msgid "image"
 msgstr ""
 
-#: models.py:825
+#: models.py:854
 msgid "images"
 msgstr ""
 
@@ -266,7 +266,7 @@ msgid "Delete images"
 msgstr ""
 
 #: templates/wagtailimages/bulk_actions/confirm_bulk_delete.html:13
-#: views/images.py:355
+#: views/images.py:326
 msgid "Are you sure you want to delete this image?"
 msgid_plural "Are you sure you want to delete these images?"
 msgstr[0] ""
@@ -368,7 +368,7 @@ msgstr[1] ""
 msgid "Change image file:"
 msgstr ""
 
-#: templates/wagtailimages/images/add.html:4 views/images.py:52
+#: templates/wagtailimages/images/add.html:4 views/images.py:62
 msgid "Add an image"
 msgstr ""
 
@@ -400,7 +400,7 @@ msgid "Editing"
 msgstr ""
 
 #: templates/wagtailimages/images/edit.html:43
-#: templates/wagtailimages/images/edit.html:99 views/images.py:343
+#: templates/wagtailimages/images/edit.html:99 views/images.py:314
 msgid "Delete image"
 msgstr ""
 
@@ -450,23 +450,11 @@ msgstr ""
 msgid "Usage"
 msgstr ""
 
-#: templates/wagtailimages/images/index.html:24
+#: templates/wagtailimages/images/index.html:14
 msgid "Sort by"
 msgstr ""
 
-#: templates/wagtailimages/images/index.html:33
-msgid "Entries per page"
-msgstr ""
-
-#: templates/wagtailimages/images/index.html:45
-msgid "Popular Tags:"
-msgstr ""
-
-#: templates/wagtailimages/images/index.html:54
-msgid "Clear"
-msgstr ""
-
-#: templates/wagtailimages/images/index.html:66
+#: templates/wagtailimages/images/index.html:26
 msgid "Select all images in listing"
 msgstr ""
 
@@ -607,7 +595,7 @@ msgid_plural "%(num_parent_objects)d images have been added to %(collection)s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views/bulk_actions/delete.py:8 views/images.py:211
+#: views/bulk_actions/delete.py:8 views/images.py:182
 msgid "Delete"
 msgstr ""
 
@@ -642,72 +630,72 @@ msgstr ""
 msgid "Edit this image"
 msgstr ""
 
-#: views/images.py:37
+#: views/images.py:46
 msgid "Newest"
 msgstr ""
 
-#: views/images.py:38
+#: views/images.py:47
 msgid "Oldest"
 msgstr ""
 
-#: views/images.py:39
+#: views/images.py:48
 msgid "Title: (A -> Z)"
 msgstr ""
 
-#: views/images.py:40
+#: views/images.py:49
 msgid "Title: (Z -> A)"
 msgstr ""
 
-#: views/images.py:41
+#: views/images.py:50
 msgid "File size: (low to high)"
 msgstr ""
 
-#: views/images.py:42
+#: views/images.py:51
 msgid "File size: (high to low)"
 msgstr ""
 
-#: views/images.py:51 wagtail_hooks.py:53 wagtail_hooks.py:170
+#: views/images.py:61 wagtail_hooks.py:52 wagtail_hooks.py:160
 msgid "Images"
 msgstr ""
 
-#: views/images.py:184
+#: views/images.py:155
 #, python-format
 msgid "Image '%(image_title)s' updated."
 msgstr ""
 
-#: views/images.py:185
+#: views/images.py:156
 msgid "Edit again"
 msgstr ""
 
-#: views/images.py:189
+#: views/images.py:160
 msgid "The image could not be saved due to errors."
 msgstr ""
 
-#: views/images.py:206
+#: views/images.py:177
 msgid ""
 "The source image file could not be found. Please change the source or delete "
 "the image."
 msgstr ""
 
-#: views/images.py:361
+#: views/images.py:332
 #, python-format
 msgid "Image '%(image_title)s' deleted."
 msgstr ""
 
-#: views/images.py:379
+#: views/images.py:350
 #, python-format
 msgid "Image '%(image_title)s' added."
 msgstr ""
 
-#: views/images.py:388
+#: views/images.py:359
 msgid "The image could not be created due to errors."
 msgstr ""
 
-#: wagtail_hooks.py:92
+#: wagtail_hooks.py:79
 msgid "Image"
 msgstr ""
 
-#: wagtail_hooks.py:190
+#: wagtail_hooks.py:180
 #, python-format
 msgid "%(count)s image"
 msgid_plural "%(count)s images"

wagtail/images/locale/pt_PT/LC_MESSAGES/django.po

@@ -260,6 +260,10 @@ msgstr "Novo"
 msgid "Latest images"
 msgstr "Últimas imagens"
 
+#, python-format
+msgid "Select %(title)s"
+msgstr "Selecionar %(title)s"
+
 msgid "Choose a format"
 msgstr "Escolher um formato"
 

wagtail/images/migrations/0026_delete_uploadedimage.py

@@ -0,0 +1,16 @@
+# Generated by Django 5.0.1 on 2024-01-30 18:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wagtailimages', '0025_alter_image_file_alter_rendition_file'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='UploadedImage',
+        ),
+    ]