wagtail 6.4.1__py3-none-any.whl → 7.0__py3-none-any.whl

wagtail/contrib/forms/locale/zh_Hans/LC_MESSAGES/django.po

@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2014-09-11 15:42+0000\n"
-"Last-Translator: Ford Guo <agile.guo@gmail.com>, 2023\n"
+"Last-Translator: 祝沙军 <zhushajun@gmail.com>, 2017\n"
 "Language-Team: Chinese (China) (http://app.transifex.com/torchbox/wagtail/"
 "language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -42,12 +42,6 @@ msgstr "起始日起"
 msgid "Date to"
 msgstr "结束日期"
 
-#, python-format
-msgid ""
-"There is another field with the label %(label_name)s, please change one of "
-"them."
-msgstr "%(label_name)s 标签被其它字段使用，请更换一个标签。"
-
 msgid "Single line text"
 msgstr "单行文本"
 

wagtail/contrib/forms/locale/zh_Hant/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2014-09-11 15:42+0000\n"
 "Last-Translator: Ocin Leung, 2020\n"
 "Language-Team: Chinese Traditional (http://app.transifex.com/torchbox/"
@@ -31,12 +31,6 @@ msgstr "起始日期"
 msgid "Date to"
 msgstr "結束日期"
 
-#, python-format
-msgid ""
-"There is another field with the label %(label_name)s, please change one of "
-"them."
-msgstr "%(label_name)s 標簽被其它欄位使用，請更換一個標簽。"
-
 msgid "Single line text"
 msgstr "單行文本"
 

wagtail/contrib/forms/tests/test_forms.py

@@ -6,6 +6,7 @@ from wagtail.contrib.forms.utils import get_field_clean_name
 from wagtail.models import Page
 from wagtail.test.testapp.models import (
     ExtendedFormField,
+    FormBuilderWithCustomWidget,
     FormField,
     FormPage,
     FormPageWithCustomFormBuilder,
@@ -304,6 +305,67 @@ class TestFormBuilder(TestCase):
             form_class.base_fields["choose_the_correct_answer"].initial,
         )
 
+    def test_custom_widget(self):
+        """
+        All builtin field types should be able to receive a custom widget
+        """
+        self.form_page.form_builder = FormBuilderWithCustomWidget
+        form = self.form_page.get_form(auto_id=None)
+        for fieldname, expected_render in [
+            (
+                "your_name",
+                '<input type="text" name="your_name" maxlength="255" class="custom">',
+            ),
+            ("your_message", '<input type="text" name="your_message" class="custom">'),
+            (
+                "your_birthday",
+                '<input type="text" name="your_birthday" class="custom">',
+            ),
+            (
+                "your_birthtime",
+                '<input type="text" name="your_birthtime" class="custom">',
+            ),
+            (
+                "your_email",
+                '<input type="text" name="your_email" maxlength="320" class="custom">',
+            ),
+            (
+                "your_homepage",
+                '<input type="text" name="your_homepage" class="custom">',
+            ),
+            (
+                "your_favourite_number",
+                '<input type="text" name="your_favourite_number" class="custom">',
+            ),
+            (
+                "your_favourite_text_editors",
+                '<input type="text" name="your_favourite_text_editors" class="custom">',
+            ),
+            (
+                "your_favourite_python_ides",
+                '<input type="text" name="your_favourite_python_ides" class="custom">',
+            ),
+            (
+                "u03a5our_favourite_u03a1ython_ixd0e",
+                '<input type="text" name="u03a5our_favourite_u03a1ython_ixd0e" class="custom">',
+            ),
+            (
+                "your_choices",
+                '<input type="text" name="your_choices" value="[\'\']" class="custom">',
+            ),
+            (
+                "i_agree_to_the_terms_of_use",
+                '<input type="text" name="i_agree_to_the_terms_of_use" class="custom">',
+            ),
+            (
+                "a_hidden_field",
+                '<input type="text" name="a_hidden_field" class="custom">',
+            ),
+        ]:
+            with self.subTest(field=fieldname):
+                form.fields[fieldname].required = False  # makes testing easier
+                self.assertHTMLEqual(form[fieldname].as_widget(), expected_render)
+
 
 class TestCustomFormBuilder(TestCase):
     def setUp(self):

wagtail/contrib/forms/tests/test_views.py

@@ -1,4 +1,5 @@
 import datetime
+import html
 from io import BytesIO
 
 from django.conf import settings
@@ -1851,9 +1852,13 @@ class TestDuplicateFormFieldLabels(WagtailTestUtils, TestCase):
 
         self.assertEqual(response.status_code, 200)
 
+        expected_validation_error_msg = html.escape(
+            "Field name 'foo' conflicts with another field. Please change the label."
+        )
+
         self.assertContains(
             response,
-            text="There is another field with the label foo, please change one of them.",
+            expected_validation_error_msg,
         )
 
     def test_adding_duplicate_form_labels_as_cleaned_name(self):
@@ -1889,9 +1894,14 @@ class TestDuplicateFormFieldLabels(WagtailTestUtils, TestCase):
 
         self.assertEqual(response.status_code, 200)
 
+        expected_validation_error_msg = html.escape(
+            "Field name 'low_earth_orbit' conflicts with another field. "
+            "Please change the label."
+        )
+
         self.assertContains(
             response,
-            text="There is another field with the label LOW EARTH ORBIT, please change one of them.",
+            expected_validation_error_msg,
         )
 
     def test_adding_duplicate_form_labels_using_override_clean_name(self):
@@ -1928,9 +1938,14 @@ class TestDuplicateFormFieldLabels(WagtailTestUtils, TestCase):
 
         self.assertEqual(response.status_code, 200)
 
+        expected_validation_error_msg = html.escape(
+            "Field name 'test duplicate' conflicts with another field. "
+            "Please change the label."
+        )
+
         self.assertContains(
             response,
-            text="There is another field with the label duplicate 1, please change one of them.",
+            expected_validation_error_msg,
         )
 
     def test_rename_existing_field_and_add_new_field_with_clashing_clean_name(
@@ -1968,9 +1983,15 @@ class TestDuplicateFormFieldLabels(WagtailTestUtils, TestCase):
         )
 
         self.assertEqual(response.status_code, 200)
+
+        expected_validation_error_msg = html.escape(
+            "Field name 'test_field' conflicts with another field. "
+            "Please change the label."
+        )
+
         self.assertContains(
             response,
-            text="There is another field with the label Test field, please change one of them.",
+            expected_validation_error_msg,
         )
 
     def test_adding_duplicate_form_labels_with_custom_related_name(self):
@@ -2014,11 +2035,146 @@ class TestDuplicateFormFieldLabels(WagtailTestUtils, TestCase):
 
         self.assertEqual(response.status_code, 200)
 
+        expected_validation_error_msg = html.escape(
+            "Field name 'chocolate' conflicts with another field. "
+            "Please change the label."
+        )
+
         self.assertContains(
             response,
-            text="There is another field with the label chocolate, please change one of them.",
+            expected_validation_error_msg,
+        )
+
+    def test_validation_errors_are_added_to_all_duplicate_fields(self):
+        """
+        Ensure all forms with duplicate labels have the correct validation error added.
+        """
+
+        form_page = FormPage(
+            title="Form page!",
+            form_fields=[FormField(label="Test field", field_type="singleline")],
+        )
+        self.root_page.add_child(instance=form_page)
+
+        post_data = {
+            "title": "Form page!",
+            "slug": "form-page",
+            "form_fields-TOTAL_FORMS": "5",
+            "form_fields-INITIAL_FORMS": "1",
+            "form_fields-MIN_NUM_FORMS": "0",
+            "form_fields-MAX_NUM_FORMS": "1000",
+            # Duplicate field labels
+            "form_fields-0-id": form_page.form_fields.first().pk,
+            "form_fields-0-label": "Test field",
+            "form_fields-0-field_type": "singleline",
+            "form_fields-1-id": "",
+            "form_fields-1-label": "Test field",
+            "form_fields-1-field_type": "singleline",
+            "form_fields-2-id": "",
+            "form_fields-2-label": "Test field",
+            "form_fields-2-field_type": "singleline",
+            "form_fields-3-id": "",
+            "form_fields-3-label": "duplicate 2",
+            "form_fields-3-field_type": "singleline",
+            "form_fields-4-id": "",
+            "form_fields-4-label": "duplicate 2",
+            "form_fields-4-field_type": "singleline",
+        }
+
+        response = self.client.post(
+            reverse("wagtailadmin_pages:edit", args=[form_page.pk]), post_data
         )
 
+        self.assertEqual(response.status_code, 200)
+
+        form = response.context["form"]
+        formset = form.formsets["form_fields"]
+
+        # Expected validation error messages
+        expected_error_text_field_0 = (
+            "The name 'test_field' is already assigned to this field and cannot be "
+            "changed. Please enter a different label for the conflicting field."
+        )
+        expected_error_text_fields_1_2 = (
+            "Field name 'test_field' conflicts with another field. Please "
+            "change the label."
+        )
+        expected_error_text_fields_3_4 = (
+            "Field name 'duplicate_2' conflicts with another field. Please "
+            "change the label."
+        )
+
+        # Check validation errors for form 0
+        self.assertIn("label", formset.forms[0].errors)
+        self.assertEqual(
+            formset.forms[0].errors["label"][0],
+            expected_error_text_field_0,
+        )
+
+        # Check validation errors for forms 1 and 2
+        for i in [1, 2]:
+            with self.subTest(
+                form_index=i,
+            ):
+                self.assertIn("label", formset.forms[i].errors)
+                self.assertEqual(
+                    formset.forms[i].errors["label"][0],
+                    expected_error_text_fields_1_2,
+                )
+
+        # Check validation errors for forms 3 and 4
+        for i in [3, 4]:
+            with self.subTest(
+                form_index=i,
+            ):
+                self.assertIn("label", formset.forms[i].errors)
+                self.assertEqual(
+                    formset.forms[i].errors["label"][0],
+                    expected_error_text_fields_3_4,
+                )
+
+    def test_deletion_of_duplicate_formset_form_field_allows_page_publish(self):
+        """
+        Test that deleting a duplicate formset form field allows the page to be
+        published.
+        """
+        form_page = FormPage(
+            title="Form page!",
+            form_fields=[FormField(label="Test field", field_type="singleline")],
+            live=False,
+        )
+        self.root_page.add_child(instance=form_page)
+        self.assertFalse(form_page.live)
+
+        post_data = {
+            "title": "Form page!",
+            "slug": "form-page",
+            "action-publish": "action-publish",
+            "form_fields-TOTAL_FORMS": "2",
+            "form_fields-INITIAL_FORMS": "1",
+            "form_fields-MIN_NUM_FORMS": "0",
+            "form_fields-MAX_NUM_FORMS": "1000",
+            "form_fields-0-id": form_page.form_fields.first().pk,
+            "form_fields-0-label": "Test field",
+            "form_fields-0-field_type": "singleline",
+            # Add a duplicate field but mark it for deletion
+            "form_fields-1-id": "",
+            "form_fields-1-label": "Test field",
+            "form_fields-1-field_type": "singleline",
+            "form_fields-1-DELETE": "on",
+        }
+
+        response = self.client.post(
+            reverse("wagtailadmin_pages:edit", args=[form_page.pk]), post_data
+        )
+
+        # Response should redirect to parent page list view
+        self.assertEqual(response.status_code, 302)
+
+        form_page.refresh_from_db()
+
+        self.assertTrue(form_page.live)
+
 
 class TestPreview(WagtailTestUtils, TestCase):
     post_data = {

wagtail/contrib/frontend_cache/backends/cloudfront.py

@@ -2,12 +2,9 @@ import logging
 import uuid
 from collections import defaultdict
 from urllib.parse import urlparse
-from warnings import warn
 
 from django.core.exceptions import ImproperlyConfigured
 
-from wagtail.utils.deprecation import RemovedInWagtail70Warning
-
 from .base import BaseBackend
 
 logger = logging.getLogger("wagtail.frontendcache")
@@ -36,37 +33,12 @@ class CloudfrontBackend(BaseBackend):
                 "The setting 'WAGTAILFRONTENDCACHE' requires the object 'DISTRIBUTION_ID'."
             )
 
-        # Add known hostnames for hostname validation (if not already defined)
-        # RemovedInWagtail70Warning
-        if isinstance(self.cloudfront_distribution_id, dict):
-            if "HOSTNAMES" in params:
-                self.hostnames.extend(self.cloudfront_distribution_id.keys())
-            else:
-                self.hostnames = list(self.cloudfront_distribution_id.keys())
-
     def purge_batch(self, urls):
         paths_by_distribution_id = defaultdict(set)
 
         for url in urls:
             url_parsed = urlparse(url)
-            distribution_id = None
-
-            if isinstance(self.cloudfront_distribution_id, dict):
-                warn(
-                    "Using a `DISTRIBUTION_ID` mapping is deprecated - use `HOSTNAMES` in combination with multiple backends instead.",
-                    category=RemovedInWagtail70Warning,
-                )
-                host = url_parsed.hostname
-                if host in self.cloudfront_distribution_id:
-                    distribution_id = self.cloudfront_distribution_id.get(host)
-                else:
-                    logger.warning(
-                        "Couldn't purge '%s' from CloudFront. Hostname '%s' not found in the DISTRIBUTION_ID mapping",
-                        url,
-                        host,
-                    )
-            else:
-                distribution_id = self.cloudfront_distribution_id
+            distribution_id = self.cloudfront_distribution_id
 
             if distribution_id:
                 paths_by_distribution_id[distribution_id].add(url_parsed.path)

wagtail/contrib/frontend_cache/tests.py

@@ -18,8 +18,7 @@ from wagtail.contrib.frontend_cache.backends import (
 )
 from wagtail.contrib.frontend_cache.utils import get_backends
 from wagtail.models import Page
-from wagtail.test.testapp.models import EventIndex
-from wagtail.utils.deprecation import RemovedInWagtail70Warning
+from wagtail.test.testapp.models import EventIndex, EventPage
 
 from .utils import (
     PurgeBatch,
@@ -29,6 +28,16 @@ from .utils import (
     purge_urls_from_cache,
 )
 
+EVENTPAGE_URLS = {
+    "http://localhost/events/final-event/",
+    "http://localhost/events/christmas/",
+    "http://localhost/events/saint-patrick/",
+    "http://localhost/events/tentative-unpublished-event/",
+    "http://localhost/events/someone-elses-event/",
+    "http://localhost/events/tentative-unpublished-event/",
+    "http://localhost/secret-plans/steal-underpants/",
+}
+
 
 class TestBackendConfiguration(SimpleTestCase):
     def test_default(self):
@@ -331,45 +340,6 @@ class TestBackendConfiguration(SimpleTestCase):
                 }
             )
 
-    @mock.patch(
-        "wagtail.contrib.frontend_cache.backends.cloudfront.CloudfrontBackend._create_invalidation"
-    )
-    def test_cloudfront_distribution_id_mapping(self, _create_invalidation):
-        backends = get_backends(
-            backend_settings={
-                "cloudfront": {
-                    "BACKEND": "wagtail.contrib.frontend_cache.backends.CloudfrontBackend",
-                    "DISTRIBUTION_ID": {
-                        "www.wagtail.org": "frontend",
-                    },
-                },
-            }
-        )
-        with self.assertWarnsMessage(
-            RemovedInWagtail70Warning,
-            "Using a `DISTRIBUTION_ID` mapping is deprecated - use `HOSTNAMES` in combination with multiple backends instead.",
-        ):
-            backends.get("cloudfront").purge(
-                "http://www.wagtail.org/home/events/christmas/"
-            )
-
-        with self.assertWarnsMessage(
-            RemovedInWagtail70Warning,
-            "Using a `DISTRIBUTION_ID` mapping is deprecated - use `HOSTNAMES` in combination with multiple backends instead.",
-        ):
-            backends.get("cloudfront").purge("http://torchbox.com/blog/")
-
-        _create_invalidation.assert_called_once_with(
-            "frontend", ["/home/events/christmas/"]
-        )
-
-        self.assertTrue(
-            backends.get("cloudfront").invalidates_hostname("www.wagtail.org")
-        )
-        self.assertFalse(
-            backends.get("cloudfront").invalidates_hostname("torchbox.com")
-        )
-
     def test_multiple(self):
         backends = get_backends(
             backend_settings={
@@ -438,7 +408,12 @@ class MockCloudflareBackend(CloudflareBackend):
         "varnish": {
             "BACKEND": "wagtail.contrib.frontend_cache.tests.MockBackend",
         },
-    }
+    },
+    CACHES={
+        "default": {
+            "BACKEND": "django.core.cache.backends.dummy.DummyCache",
+        }
+    },
 )
 class TestCachePurgingFunctions(TestCase):
     fixtures = ["test.json"]
@@ -457,26 +432,74 @@ class TestCachePurgingFunctions(TestCase):
         self.assertEqual(PURGED_URLS, {"http://localhost/foo", "http://localhost/bar"})
 
     def test_purge_page_from_cache(self):
+        page = EventIndex.objects.get(url_path="/home/events/")
         with self.captureOnCommitCallbacks(execute=True):
-            page = EventIndex.objects.get(url_path="/home/events/")
-            purge_page_from_cache(page)
+            with self.assertNumQueries(1):
+                # Because no cache object is provided, a query is needed to
+                # fetch site root paths in order to derive page urls
+                purge_page_from_cache(page)
         self.assertEqual(
-            PURGED_URLS, {"http://localhost/events/", "http://localhost/events/past/"}
+            PURGED_URLS,
+            {"http://localhost/events/", "http://localhost/events/past/"},
         )
 
-    def test_purge_pages_from_cache(self):
+    def test_purge_page_from_cache_with_shared_cache_object(self):
+        page = EventIndex.objects.get(url_path="/home/events/")
+
+        # Ensure site root paths are already cached, which should result in
+        # zero additional queries being incurred by this test
+        page._get_relevant_site_root_paths()
+
         with self.captureOnCommitCallbacks(execute=True):
-            purge_pages_from_cache(EventIndex.objects.all())
+            # Because site root paths are already available via the cache_object,
+            # no further queries should be needed to derive page urls
+            with self.assertNumQueries(0):
+                purge_page_from_cache(page, cache_object=page)
+
         self.assertEqual(
-            PURGED_URLS, {"http://localhost/events/", "http://localhost/events/past/"}
+            PURGED_URLS,
+            {"http://localhost/events/", "http://localhost/events/past/"},
         )
 
-    def test_purge_batch(self):
+    def test_purge_pages_from_cache(self):
+        pages = list(Page.objects.all().type(EventPage))
         with self.captureOnCommitCallbacks(execute=True):
-            batch = PurgeBatch()
-            page = EventIndex.objects.get(url_path="/home/events/")
+            with self.assertNumQueries(1):
+                # Because no cache object is provided, a query is needed to
+                # fetch site root paths in order to derive page urls
+                purge_pages_from_cache(pages)
+        self.assertEqual(PURGED_URLS, EVENTPAGE_URLS)
+
+    def test_purge_pages_from_cache_with_shared_cache_object(self):
+        pages = list(Page.objects.all().type(EventPage))
+
+        # Use the first page as the cache object for the operation
+        cache_object = pages[0]
+
+        # Ensure site root paths are already cached, which should result in
+        # zero additional queries being incurred by this test
+        cache_object._get_relevant_site_root_paths()
+
+        with self.captureOnCommitCallbacks(execute=True):
+            # Because site root paths are already available via the cache_object,
+            # no further queries should be needed to derive page urls
+            with self.assertNumQueries(0):
+                purge_pages_from_cache(pages, cache_object=cache_object)
+
+        self.assertEqual(PURGED_URLS, EVENTPAGE_URLS)
+
+    def test_purge_batch(self):
+        page = EventIndex.objects.get(url_path="/home/events/")
+        batch = PurgeBatch()
+
+        # Because no cache object is provided, a query is needed to
+        # fetch site root paths in order to derive page urls
+        with self.assertNumQueries(1):
             batch.add_page(page)
-            batch.add_url("http://localhost/foo")
+
+        batch.add_url("http://localhost/foo")
+
+        with self.captureOnCommitCallbacks(execute=True):
             batch.purge()
 
         self.assertEqual(
@@ -488,6 +511,43 @@ class TestCachePurgingFunctions(TestCase):
             },
         )
 
+    def test_purge_batch_with_multiple_pages(self):
+        pages = list(Page.objects.all().type(EventPage))
+        batch = PurgeBatch()
+
+        # Because the batch has no cache object, a query is needed to
+        # fetch site root paths in order to derive page urls
+        with self.assertNumQueries(1):
+            batch.add_pages(pages)
+
+        with self.captureOnCommitCallbacks(execute=True):
+            batch.purge()
+
+        self.assertEqual(PURGED_URLS, EVENTPAGE_URLS)
+
+    def test_multiple_purge_batches_with_shared_cache_object(self):
+        pages = list(Page.objects.all().type(EventPage))
+
+        # Use the first page as the cache object for the batch
+        cache_object = pages[0]
+
+        # Ensure site root paths are already cached, which should result in
+        # zero additional queries being incurred by this test
+        cache_object._get_relevant_site_root_paths()
+
+        batch = PurgeBatch(cache_object=cache_object)
+
+        with self.assertNumQueries(0):
+            # Because site root paths are already available via the cache_object,
+            # no queries should be needed to derive page urls
+            batch.add_pages(pages)
+
+        with self.captureOnCommitCallbacks(execute=True):
+            batch.purge()
+
+        self.assertEqual(PURGED_URLS, EVENTPAGE_URLS)
+        PURGED_URLS.clear()
+
     @override_settings(
         WAGTAILFRONTENDCACHE={
             "varnish": {