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

wagtail/documents/tests/test_collection_privacy.py

@@ -1,6 +1,6 @@
 from django.contrib.auth.models import Group
 from django.core.files.base import ContentFile
-from django.test import TestCase
+from django.test import TestCase, override_settings
 from django.urls import reverse
 
 from wagtail.documents.models import Document
@@ -19,6 +19,7 @@ class TestCollectionPrivacyDocument(WagtailTestUtils, TestCase):
     def setUp(self):
         self.fake_file = ContentFile(b"A boring example document")
         self.fake_file.name = "test.txt"
+        self.collection = Collection.objects.get(id=2)
         self.password_collection = Collection.objects.get(name="Password protected")
         self.login_collection = Collection.objects.get(name="Login protected")
         self.group_collection = Collection.objects.get(name="Group protected")
@@ -106,6 +107,28 @@ class TestCollectionPrivacyDocument(WagtailTestUtils, TestCase):
             )
             self.assertRedirects(response, "/")
 
+    @override_settings(
+        WAGTAILDOCS_PASSWORD_REQUIRED_TEMPLATE="tests/custom_docs_password_required.html"
+    )
+    def test_anonymous_user_must_authenticate_with_custom_password_required_template(
+        self
+    ):
+        secret_document = Document.objects.create(
+            title="Test document",
+            file=self.fake_file,
+            collection=self.password_collection,
+        )
+        doc_url = reverse(
+            "wagtaildocs_serve", args=(secret_document.id, secret_document.filename)
+        )
+        response = self.client.get(doc_url)
+        self.assertNotEqual(
+            response.templates[0].name, "wagtaildocs/password_required.html"
+        )
+        self.assertEqual(
+            response.templates[0].name, "tests/custom_docs_password_required.html"
+        )
+
     def test_group_restriction_with_anonymous_user(self):
         response, url = self.get_document(self.group_collection)
         self.assertRedirects(response, f"/_util/login/?next={url}")
@@ -133,3 +156,34 @@ class TestCollectionPrivacyDocument(WagtailTestUtils, TestCase):
         self.login(username="eventmoderator", password="password")
         response, url = self.get_document(self.login_collection)
         self.assertEqual(response.status_code, 200)
+
+    def test_set_shared_password_with_logged_in_user(self):
+        self.login()
+        response = self.client.get(
+            reverse("wagtailadmin_collections:set_privacy", args=(self.collection.id,)),
+        )
+
+        input_el = self.get_soup(response.content).select_one("[data-field-input]")
+        self.assertEqual(response.status_code, 200)
+
+        # check that input option for password is visible
+        self.assertIn("password", response.context["form"].fields)
+
+        # check that the option for password is visible
+        self.assertIsNotNone(input_el)
+
+    @override_settings(
+        WAGTAILDOCS_PRIVATE_COLLECTION_OPTIONS={"SHARED_PASSWORD": False}
+    )
+    def test_unset_shared_password_with_logged_in_user(self):
+        self.login()
+        response = self.client.get(
+            reverse("wagtailadmin_collections:set_privacy", args=(self.collection.id,)),
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertNotIn("password", response.context["form"].fields)
+        self.assertFalse(
+            response.context["form"]
+            .fields["restriction_type"]
+            .valid_value(CollectionViewRestriction.PASSWORD)
+        )

wagtail/documents/tests/test_rich_text.py

@@ -1,4 +1,5 @@
 from django.test import TestCase
+from django.urls import reverse_lazy
 
 from wagtail.documents import get_document_model
 from wagtail.documents.rich_text import (
@@ -8,6 +9,7 @@ from wagtail.documents.rich_text.editor_html import (
     DocumentLinkHandler as EditorHtmlDocumentLinkHandler,
 )
 from wagtail.fields import RichTextField
+from wagtail.rich_text.feature_registry import FeatureRegistry
 from wagtail.test.utils import WagtailTestUtils
 
 
@@ -60,3 +62,15 @@ class TestFrontendDocumentLinkHandler(TestCase):
             ),
             [(get_document_model(), "1", "", "")],
         )
+
+
+class TestEntityFeatureChooserUrls(TestCase):
+    def test_chooser_urls_exist(self):
+        features = FeatureRegistry()
+        document = features.get_editor_plugin("draftail", "document-link")
+
+        self.assertIsNotNone(document.data.get("chooserUrls"))
+        self.assertEqual(
+            document.data["chooserUrls"]["documentChooser"],
+            reverse_lazy("wagtaildocs_chooser:choose"),
+        )

wagtail/documents/views/documents.py

@@ -12,6 +12,7 @@ from django.utils.translation import gettext_lazy, ngettext
 
 from wagtail.admin import messages
 from wagtail.admin.auth import PermissionPolicyChecker
+from wagtail.admin.filters import BaseMediaFilterSet
 from wagtail.admin.ui.tables import (
     BulkActionsCheckboxColumn,
     Column,
@@ -25,9 +26,9 @@ from wagtail.admin.views import generic
 from wagtail.documents import get_document_model
 from wagtail.documents.forms import get_document_form
 from wagtail.documents.permissions import permission_policy
-from wagtail.models import Collection
 
 permission_checker = PermissionPolicyChecker(permission_policy)
+Document = get_document_model()
 
 
 class BulkActionsColumn(BulkActionsCheckboxColumn):
@@ -49,6 +50,14 @@ class DocumentTable(Table):
         return context
 
 
+class DocumentsFilterSet(BaseMediaFilterSet):
+    permission_policy = permission_policy
+
+    class Meta:
+        model = Document
+        fields = []
+
+
 class IndexView(generic.IndexView):
     permission_policy = permission_policy
     any_permission_required = ["add", "change", "delete"]
@@ -65,9 +74,11 @@ class IndexView(generic.IndexView):
     results_template_name = "wagtaildocs/documents/index_results.html"
     default_ordering = "title"
     table_class = DocumentTable
+    filterset_class = DocumentsFilterSet
     model = get_document_model()
     add_item_label = gettext_lazy("Add a document")
     show_other_searches = True
+    _show_breadcrumbs = True
 
     def get_base_queryset(self):
         # Get documents (filtered by user permission)
@@ -75,17 +86,10 @@ class IndexView(generic.IndexView):
             self.request.user, ["change", "delete"]
         ).select_related("collection")
 
-    def filter_queryset(self, queryset):
-        self.current_collection = None
-        collection_id = self.request.GET.get("collection_id")
-        if collection_id:
-            try:
-                self.current_collection = Collection.objects.get(id=collection_id)
-                queryset = queryset.filter(collection=self.current_collection)
-            except (ValueError, Collection.DoesNotExist):
-                pass
-
-        return queryset
+    @cached_property
+    def current_collection(self):
+        # Upon validation, the cleaned data is a Collection instance
+        return self.filters and self.filters.form.cleaned_data.get("collection_id")
 
     @cached_property
     def columns(self):
@@ -106,7 +110,7 @@ class IndexView(generic.IndexView):
                 width="16%",
             ),
         ]
-        if self.collections:
+        if self.filters and "collection_id" in self.filters.filters:
             columns.insert(
                 3,
                 Column("collection", label=_("Collection"), accessor="collection.name"),
@@ -130,10 +134,10 @@ class IndexView(generic.IndexView):
         return next_url
 
     def get_add_url(self):
-        # Pass the query string so that the collection filter is preserved
+        # Pass the collection filter to prefill the add form's collection field
         return set_query_params(
             super().get_add_url(),
-            self.request.GET.copy(),
+            {"collection_id": self.current_collection and self.current_collection.pk},
         )
 
     def get_edit_url(self, instance):
@@ -142,15 +146,14 @@ class IndexView(generic.IndexView):
             {"next": self.get_next_url()},
         )
 
+    def get_filterset_kwargs(self):
+        kwargs = super().get_filterset_kwargs()
+        kwargs["is_searching"] = self.is_searching
+        return kwargs
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-
-        context.update(
-            {
-                "collections": self.collections,
-                "current_collection": self.current_collection,
-            }
-        )
+        context["current_collection"] = self.current_collection
         return context
 
 

wagtail/documents/views/multiple.py

@@ -12,14 +12,12 @@ from wagtail.admin.views.generic.multiple_upload import EditView as BaseEditView
 
 from .. import get_document_model
 from ..forms import get_document_form, get_document_multi_form
-from ..models import UploadedDocument
 from ..permissions import permission_policy
 
 
 class AddView(BaseAddView):
     permission_policy = permission_policy
     template_name = "wagtaildocs/multiple/add.html"
-    upload_model = UploadedDocument
 
     edit_object_url_name = "wagtaildocs:edit_multiple"
     delete_object_url_name = "wagtaildocs:delete_multiple"
@@ -31,7 +29,7 @@ class AddView(BaseAddView):
     delete_upload_url_name = "wagtaildocs:delete_upload_multiple"
     edit_upload_form_prefix = "uploaded-document"
     context_upload_name = "uploaded_document"
-    context_upload_id_name = "uploaded_document_id"
+    context_upload_id_name = "uploaded_file_id"
 
     def get_model(self):
         return get_document_model()
@@ -90,8 +88,7 @@ class DeleteView(BaseDeleteView):
 class CreateFromUploadedDocumentView(BaseCreateFromUploadView):
     edit_upload_url_name = "wagtaildocs:create_multiple_from_uploaded_document"
     delete_upload_url_name = "wagtaildocs:delete_upload_multiple"
-    upload_model = UploadedDocument
-    upload_pk_url_kwarg = "uploaded_document_id"
+    upload_pk_url_kwarg = "uploaded_file_id"
     edit_upload_form_prefix = "uploaded-document"
     context_object_id_name = "doc_id"
     context_upload_name = "uploaded_document"
@@ -118,5 +115,7 @@ class CreateFromUploadedDocumentView(BaseCreateFromUploadView):
 
 
 class DeleteUploadView(BaseDeleteUploadView):
-    upload_model = UploadedDocument
-    upload_pk_url_kwarg = "uploaded_document_id"
+    upload_pk_url_kwarg = "uploaded_file_id"
+
+    def get_model(self):
+        return get_document_model()

wagtail/documents/views/serve.py

@@ -1,3 +1,5 @@
+from warnings import warn
+
 from django.conf import settings
 from django.http import FileResponse, Http404, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
@@ -12,6 +14,7 @@ from wagtail.documents.models import document_served
 from wagtail.forms import PasswordViewRestrictionForm
 from wagtail.models import CollectionViewRestriction
 from wagtail.utils import sendfile_streaming_backend
+from wagtail.utils.deprecation import RemovedInWagtail70Warning
 from wagtail.utils.sendfile import sendfile
 
 
@@ -135,9 +138,21 @@ def authenticate_with_password(request, restriction_id):
 
     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/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/locale/fr/LC_MESSAGES/django.po

@@ -4,8 +4,8 @@
 #
 # Translators:
 # Bertrand Bordage <bordage.bertrand@gmail.com>, 2015,2018
-# fpoulain <fpoulain@metrodore.fr>, 2018
-# fpoulain <fpoulain@metrodore.fr>, 2018
+# 69c761fa404d2f74d5a7a2904d9e6f47_dc2dbc9 <f37077798760362881f9d396b6e22ec7_1878>, 2018
+# 69c761fa404d2f74d5a7a2904d9e6f47_dc2dbc9 <f37077798760362881f9d396b6e22ec7_1878>, 2018
 # Léo <leo@naeka.fr>, 2016
 # Loic Teixeira, 2018,2020
 # Loic Teixeira, 2020

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

@@ -17,8 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he_IL\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % "
-"1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % "
+"1 == 0) ? 1: 2;\n"
 
 msgid "Cannot find an embed for this URL."
 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/ca/LC_MESSAGES/django.po

@@ -416,6 +416,18 @@ msgstr "Previsualització"
 msgid "URL"
 msgstr "URL"
 
+msgid "Image URL"
+msgstr "URL d'imatge"
+
+msgid "Copy URL"
+msgstr "Copiar URL"
+
+msgid "Copied to clipboard"
+msgstr "S'ha copiat al porta-retalls"
+
+msgid "Copying to clipboard failed"
+msgstr "Ha fallat la còpia al porta-retalls"
+
 msgid "Add multiple images"
 msgstr "Afegir diverses imatges"