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

wagtail/documents/views/documents.py

@@ -162,7 +162,6 @@ class CreateView(generic.CreateView):
     error_message = gettext_lazy("The document could not be created due to errors.")
     template_name = "wagtaildocs/documents/add.html"
     header_icon = "doc-full-inverse"
-    _show_breadcrumbs = True
 
     @cached_property
     def model(self):
@@ -197,7 +196,6 @@ class EditView(generic.EditView):
     delete_url_name = "wagtaildocs:delete"
     header_icon = "doc-full-inverse"
     context_object_name = "document"
-    _show_breadcrumbs = True
 
     @cached_property
     def model(self):
@@ -253,6 +251,7 @@ class EditView(generic.EditView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
+        context["usage_count_val"] = self.object.get_usage().count()
         context["filesize"] = self.object.get_file_size()
         context["next"] = self.next_url
         return context

wagtail/documents/views/multiple.py

@@ -25,7 +25,6 @@ class AddView(WagtailAdminTemplateMixin, BaseAddView):
     template_name = "wagtaildocs/multiple/add.html"
     header_icon = "doc-full-inverse"
     page_title = gettext_lazy("Add documents")
-    _show_breadcrumbs = True
 
     index_url_name = "wagtaildocs:index"
     edit_object_url_name = "wagtaildocs:edit_multiple"

wagtail/documents/views/serve.py

@@ -90,7 +90,7 @@ def serve(request, document_id, document_filename):
             # Fallback to streaming backend if user hasn't specified SENDFILE_BACKEND
             sendfile_opts["backend"] = sendfile_streaming_backend.sendfile
 
-        return sendfile(request, local_path, **sendfile_opts)
+        response = sendfile(request, local_path, **sendfile_opts)
 
     else:
         # We are using a storage backend which does not expose filesystem paths
@@ -107,7 +107,14 @@ def serve(request, document_id, document_filename):
         # FIXME: storage backends are not guaranteed to implement 'size'
         response["Content-Length"] = doc.file.size
 
-        return response
+    # Add a CSP header to prevent inline execution
+    if getattr(settings, "WAGTAILDOCS_BLOCK_EMBEDDED_CONTENT", True):
+        response["Content-Security-Policy"] = "default-src 'none'"
+
+    # Prevent browsers from auto-detecting the content-type of a document
+    response["X-Content-Type-Options"] = "nosniff"
+
+    return response
 
 
 def authenticate_with_password(request, restriction_id):

wagtail/documents/wagtail_hooks.py

@@ -3,6 +3,7 @@ from warnings import warn
 from django.conf import settings
 from django.template.response import TemplateResponse
 from django.urls import include, path, reverse, reverse_lazy
+from django.utils.cache import add_never_cache_headers
 from django.utils.translation import gettext, ngettext
 from django.utils.translation import gettext_lazy as _
 
@@ -200,7 +201,11 @@ def check_view_restrictions(document, request):
                     )
 
                 context = {"form": form, "action_url": action_url}
-                return TemplateResponse(request, password_required_template, context)
+                response = TemplateResponse(
+                    request, password_required_template, context
+                )
+                add_never_cache_headers(response)
+                return response
 
             elif restriction.restriction_type in [
                 BaseViewRestriction.LOGIN,

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-10-21 17:53+0100\n"
+"POT-Creation-Date: 2025-01-20 17:59+0000\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"

wagtail/embeds/oembed_providers.py

@@ -5,14 +5,6 @@ animoto = {
     ],
 }
 
-app_net = {
-    "endpoint": "https://alpha-api.app.net/oembed",
-    "urls": [
-        r"^https?://alpha\.app\.net/[^#?/]+/post/.+$",
-        r"^https?://photos\.app\.net/[^#?/]+/.+$",
-    ],
-}
-
 audioboom = {
     "endpoint": "https://audioboom.com/publishing/oembed.{format}",
     "urls": [
@@ -21,22 +13,6 @@ audioboom = {
     ],
 }
 
-bambuser = {
-    "endpoint": "http://api.bambuser.com/oembed.{format}",
-    "urls": [
-        r"^http://bambuser\.com/channel/[^#?/]+/broadcast/.+$",
-        r"^http://bambuser\.com/channel/.+$",
-        r"^http://bambuser\.com/v/.+$",
-    ],
-}
-
-blip_tv = {
-    "endpoint": "http://blip.tv/oembed/",
-    "urls": [
-        r"^http://[-\w]+\.blip\.tv/.+$",
-    ],
-}
-
 cacoo = {
     "endpoint": "http://cacoo.com/oembed.{format}",
     "urls": [
@@ -392,24 +368,6 @@ pinterest = {
 }
 
 
-qik = {
-    "endpoint": "http://qik.com/api/oembed.{format}",
-    "urls": [
-        r"^http://qik\.com/.+$",
-        r"^http://qik\.ly/.+$",
-    ],
-}
-
-
-rdio = {
-    "endpoint": "http://www.rdio.com/api/oembed",
-    "urls": [
-        r"^http://(?:wwww\.)?rdio\.com/people/[^#?/]+/playlists/.+$",
-        r"^http://[-\w]+\.rdio\.com/artist/[^#?/]+/album/.+$",
-    ],
-}
-
-
 reddit = {
     "endpoint": "https://www.reddit.com/oembed",
     "urls": [
@@ -418,13 +376,6 @@ reddit = {
 }
 
 
-revision3 = {
-    "endpoint": "http://revision3.com/api/oembed/",
-    "urls": [
-        r"^http://[-\w]+\.revision3\.com/.+$",
-    ],
-}
-
 roomshare = {
     "endpoint": "https://roomshare.jp/oembed.{format}",
     "urls": [
@@ -574,14 +525,6 @@ ustream = {
 }
 
 
-vhx_tv = {
-    "endpoint": "http://vhx.tv/services/oembed.{format}",
-    "urls": [
-        r"^https?://(?:www\.)?vhx\.tv/.+$",
-    ],
-}
-
-
 videojug = {
     "endpoint": "http://www.videojug.com/oembed.{format}",
     "urls": [
@@ -680,10 +623,7 @@ youtube = {
 
 all_providers = [
     animoto,
-    app_net,
     audioboom,
-    bambuser,
-    blip_tv,
     cacoo,
     chirb,
     circuitlab,
@@ -728,10 +668,7 @@ all_providers = [
     opera,
     photobucket,
     pinterest,
-    qik,
-    rdio,
     reddit,
-    revision3,
     roomshare,
     sapo,
     screenr,
@@ -751,7 +688,6 @@ all_providers = [
     twitter,
     urtak,
     ustream,
-    vhx_tv,
     viddler,
     videojug,
     vidyard,

wagtail/fields.py

@@ -239,6 +239,9 @@ class StreamField(models.Field):
         defaults.update(kwargs)
         return super().formfield(**defaults)
 
+    def get_default(self):
+        return self.stream_block.normalize(super().get_default())
+
     def value_to_string(self, obj):
         # This method is used for serialization using django.core.serializers,
         # which is used by dumpdata and loaddata for serializing model objects.

wagtail/images/apps.py

@@ -3,7 +3,6 @@ from django.db.models import ForeignKey
 from django.utils.translation import gettext_lazy as _
 
 from . import checks, get_image_model  # NOQA: F401
-from .signal_handlers import register_signal_handlers
 
 
 class WagtailImagesAppConfig(AppConfig):
@@ -14,6 +13,8 @@ class WagtailImagesAppConfig(AppConfig):
     default_attrs = {}
 
     def ready(self):
+        from .signal_handlers import register_signal_handlers
+
         register_signal_handlers()
 
         # Set up model forms to use AdminImageChooser for any ForeignKey to the image model

wagtail/images/blocks.py

@@ -140,7 +140,11 @@ class ImageBlock(StructBlock):
         # For backward compatibility with ImageChooserBlock
         if value is None or isinstance(value, int):
             image = self.child_blocks["image"].to_python(value)
-            struct_value = {"image": image, "decorative": False, "alt_text": None}
+            struct_value = {
+                "image": image,
+                "decorative": False,
+                "alt_text": (image.default_alt_text if image else ""),
+            }
         else:
             struct_value = super().to_python(value)
         return self._struct_value_to_image(struct_value)
@@ -157,7 +161,7 @@ class ImageBlock(StructBlock):
                 {
                     "image": image,
                     "decorative": False,
-                    "alt_text": None,
+                    "alt_text": (image.default_alt_text if image else ""),
                 }
                 for image in image_values
             ]
@@ -242,6 +246,14 @@ class ImageBlock(StructBlock):
     def render_basic(self, value, context=None):
         return self.child_blocks["image"].render_basic(value, context=context)
 
+    def get_block_by_content_path(self, value, path_elements):
+        if path_elements:
+            return super().get_block_by_content_path(
+                self._image_to_struct_value(value), path_elements
+            )
+        else:
+            return self.bind(value)
+
     class Meta:
         icon = "image"
         template = "wagtailimages/widgets/image.html"

wagtail/images/forms.py

@@ -1,3 +1,5 @@
+import json
+
 from django import forms
 from django.conf import settings
 from django.forms.models import modelform_factory
@@ -190,9 +192,44 @@ class URLGeneratorForm(forms.Form):
             ("fill", _("Resize to fill")),
         ),
     )
-    width = forms.IntegerField(label=_("Width"), min_value=0)
-    height = forms.IntegerField(label=_("Height"), min_value=0)
-    closeness = forms.IntegerField(label=_("Closeness"), min_value=0, initial=0)
+    width = forms.IntegerField(
+        label=_("Width"),
+        min_value=0,
+        widget=forms.NumberInput(
+            attrs={
+                "disabled": True,
+                "data-w-rules-target": "enable",
+                "data-w-rules": json.dumps(
+                    {"filter_method": ["width", "max", "min", "fill"]}
+                ),
+            },
+        ),
+    )
+    height = forms.IntegerField(
+        label=_("Height"),
+        min_value=0,
+        widget=forms.NumberInput(
+            attrs={
+                "disabled": True,
+                "data-w-rules-target": "enable",
+                "data-w-rules": json.dumps(
+                    {"filter_method": ["height", "max", "min", "fill"]}
+                ),
+            }
+        ),
+    )
+    closeness = forms.IntegerField(
+        label=_("Closeness"),
+        min_value=0,
+        initial=0,
+        widget=forms.NumberInput(
+            attrs={
+                "disabled": True,
+                "data-w-rules-target": "enable",
+                "data-w-rules": json.dumps({"filter_method": ["fill"]}),
+            }
+        ),
+    )
 
 
 GroupImagePermissionFormSet = collection_member_permission_formset_factory(

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

@@ -177,6 +177,10 @@ msgstr "جديد"
 msgid "Latest images"
 msgstr "احد الصور"
 
+#, python-format
+msgid "Select %(title)s"
+msgstr "إختر %(title)s"
+
 msgid "Choose a format"
 msgstr "اختر شكلا"
 

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-10-21 17:53+0100\n"
+"POT-Creation-Date: 2025-01-20 17:59+0000\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"
@@ -18,19 +18,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps.py:12
+#: apps.py:11
 msgid "Wagtail images"
 msgstr ""
 
-#: blocks.py:72 blocks.py:83 forms.py:160
+#: blocks.py:72 blocks.py:83 forms.py:162
 msgid "Image is decorative"
 msgstr ""
 
-#: blocks.py:74 blocks.py:86 forms.py:162
+#: blocks.py:74 blocks.py:86 forms.py:164
 msgid "Alt text"
 msgstr ""
 
-#: blocks.py:194 forms.py:175
+#: blocks.py:196 forms.py:177
 msgid "Please add some alt text for your image or mark it as decorative"
 msgstr ""
 
@@ -88,75 +88,75 @@ msgstr ""
 msgid "Right-aligned"
 msgstr ""
 
-#: forms.py:29 views/bulk_actions/add_to_collection.py:13
+#: forms.py:31 views/bulk_actions/add_to_collection.py:13
 msgid "Collection"
 msgstr ""
 
-#: forms.py:155
+#: forms.py:157
 msgid "Format"
 msgstr ""
 
-#: forms.py:183
+#: forms.py:185
 msgid "Filter"
 msgstr ""
 
-#: forms.py:185
+#: forms.py:187
 msgid "Original size"
 msgstr ""
 
-#: forms.py:186
+#: forms.py:188
 msgid "Resize to width"
 msgstr ""
 
-#: forms.py:187
+#: forms.py:189
 msgid "Resize to height"
 msgstr ""
 
-#: forms.py:188
+#: forms.py:190
 msgid "Resize to min"
 msgstr ""
 
-#: forms.py:189
+#: forms.py:191
 msgid "Resize to max"
 msgstr ""
 
-#: forms.py:190
+#: forms.py:192
 msgid "Resize to fill"
 msgstr ""
 
-#: forms.py:193
+#: forms.py:196
 msgid "Width"
 msgstr ""
 
-#: forms.py:194
+#: forms.py:209
 msgid "Height"
 msgstr ""
 
-#: forms.py:195
+#: forms.py:222
 msgid "Closeness"
 msgstr ""
 
-#: forms.py:201
+#: forms.py:238
 msgid "Add"
 msgstr ""
 
-#: forms.py:201
+#: forms.py:238
 msgid "Add/edit images you own"
 msgstr ""
 
-#: forms.py:202
+#: forms.py:239
 msgid "Edit"
 msgstr ""
 
-#: forms.py:202
+#: forms.py:239
 msgid "Edit any image"
 msgstr ""
 
-#: forms.py:203
+#: forms.py:240
 msgid "Choose"
 msgstr ""
 
-#: forms.py:203
+#: forms.py:240
 msgid "Select images in choosers"
 msgstr ""
 
@@ -270,14 +270,14 @@ msgid "Delete images"
 msgstr ""
 
 #: templates/wagtailimages/bulk_actions/confirm_bulk_delete.html:17
-#: views/images.py:330
+#: views/images.py:329
 msgid "Are you sure you want to delete this image?"
 msgid_plural "Are you sure you want to delete these images?"
 msgstr[0] ""
 msgstr[1] ""
 
 #: templates/wagtailimages/bulk_actions/confirm_bulk_delete.html:28
-#: templates/wagtailimages/images/edit.html:67
+#: templates/wagtailimages/images/edit.html:66
 #, python-format
 msgid "Used %(usage_count)s time"
 msgid_plural "Used %(usage_count)s times"
@@ -374,13 +374,13 @@ msgstr ""
 msgid "Add an image"
 msgstr ""
 
-#: templates/wagtailimages/images/add.html:45 views/chooser.py:52
-#: views/chooser.py:319
+#: templates/wagtailimages/images/add.html:45 views/chooser.py:53
+#: views/chooser.py:320
 msgid "Uploading…"
 msgstr ""
 
-#: templates/wagtailimages/images/add.html:48 views/chooser.py:51
-#: views/chooser.py:318
+#: templates/wagtailimages/images/add.html:48 views/chooser.py:52
+#: views/chooser.py:319
 msgid "Upload"
 msgstr ""
 
@@ -494,52 +494,52 @@ msgstr ""
 msgid "Add multiple images"
 msgstr ""
 
-#: templates/wagtailimages/multiple/add.html:14
+#: templates/wagtailimages/multiple/add.html:20
 msgid "Drag and drop images into this area to upload immediately."
 msgstr ""
 
-#: templates/wagtailimages/multiple/add.html:19
+#: templates/wagtailimages/multiple/add.html:25
 msgid "Or choose from your computer"
 msgstr ""
 
-#: templates/wagtailimages/multiple/add.html:34
+#: templates/wagtailimages/multiple/add.html:40
 msgid "Add to collection:"
 msgstr ""
 
-#: templates/wagtailimages/multiple/add.html:67
+#: templates/wagtailimages/multiple/add.html:73
 msgid ""
 "Please provide an image description to comply with best practices for "
 "accessibility."
 msgstr ""
 
-#: templates/wagtailimages/multiple/add.html:68
+#: templates/wagtailimages/multiple/add.html:74
 msgid ""
 "Upload successful. Please update this image with a more appropriate title, "
 "if necessary. You may also delete the image completely if the upload wasn't "
 "required."
 msgstr ""
 
-#: templates/wagtailimages/multiple/add.html:70
+#: templates/wagtailimages/multiple/add.html:76
 msgid ""
 "Upload successful. However, your new image seems to be a duplicate of this "
 "existing image. You may delete it if it wasn't required."
 msgstr ""
 
-#: templates/wagtailimages/multiple/add.html:72
+#: templates/wagtailimages/multiple/add.html:78
 msgid "Sorry, upload failed."
 msgstr ""
 
-#: templates/wagtailimages/multiple/add.html:74
+#: templates/wagtailimages/multiple/add.html:80
 msgid "Server Error"
 msgstr ""
 
-#: templates/wagtailimages/multiple/add.html:75
+#: templates/wagtailimages/multiple/add.html:81
 msgid ""
 "Report this error to your website administrator with the following "
 "information:"
 msgstr ""
 
-#: templates/wagtailimages/multiple/add.html:78
+#: templates/wagtailimages/multiple/add.html:84
 msgid "Image updated."
 msgstr ""
 
@@ -585,7 +585,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:181
+#: views/bulk_actions/delete.py:8 views/images.py:180
 msgid "Delete"
 msgstr ""
 
@@ -600,15 +600,15 @@ msgid_plural "%(num_parent_objects)d images have been deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views/chooser.py:317 widgets.py:13
+#: views/chooser.py:318 widgets.py:13
 msgid "Choose an image"
 msgstr ""
 
-#: views/chooser.py:320
+#: views/chooser.py:321
 msgid "Choose another image"
 msgstr ""
 
-#: views/chooser.py:321 widgets.py:15
+#: views/chooser.py:322 widgets.py:15
 msgid "Edit this image"
 msgstr ""
 
@@ -644,12 +644,12 @@ msgstr ""
 msgid "The image could not be saved due to errors."
 msgstr ""
 
-#: views/images.py:160
+#: views/images.py:159
 #, python-format
 msgid "Image '%(image_title)s' updated."
 msgstr ""
 
-#: views/images.py:178
+#: views/images.py:177
 msgid ""
 "The source image file could not be found. Please change the source or delete "
 "the image."
@@ -659,20 +659,20 @@ msgstr ""
 msgid "Generate URL"
 msgstr ""
 
-#: views/images.py:318
+#: views/images.py:317
 msgid "Delete image"
 msgstr ""
 
-#: views/images.py:336
+#: views/images.py:335
 #, python-format
 msgid "Image '%(image_title)s' deleted."
 msgstr ""
 
-#: views/images.py:346
+#: views/images.py:345
 msgid "The image could not be created due to errors."
 msgstr ""
 
-#: views/images.py:367
+#: views/images.py:365
 #, python-format
 msgid "Image '%(image_title)s' added."
 msgstr ""

wagtail/images/migrations/0023_add_choose_permissions.py

@@ -80,6 +80,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("wagtailimages", "0022_uploadedimage"),
+        ("wagtailadmin", "0001_create_admin_access_permissions"),
     ]
 
     operations = [

wagtail/images/rich_text/contentstate.py

@@ -1,6 +1,7 @@
 """
 Draftail / contentstate conversion
 """
+
 from draftjs_exporter.dom import DOM
 
 from wagtail.admin.rich_text.converters.contentstate_models import Entity

wagtail/images/rich_text/editor_html.py

@@ -1,6 +1,7 @@
 """
 editor-html conversion for contenteditable editors
 """
+
 from wagtail.admin.rich_text.converters import editor_html
 from wagtail.images import get_image_model
 from wagtail.images.formats import get_image_format