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

wagtail/contrib/forms/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"
@@ -30,7 +30,7 @@ msgstr ""
 msgid "Date to"
 msgstr ""
 
-#: forms.py:203
+#: forms.py:221
 #, python-format
 msgid ""
 "There is another field with the label %(label_name)s, please change one of "

wagtail/contrib/forms/tests/test_models.py

@@ -603,11 +603,13 @@ class TestFormPageWithCustomFormBuilder(WagtailTestUtils, TestCase):
             html=True,
         )
         # check ip address field has rendered
-        self.assertContains(
-            response,
-            '<input type="text" name="device_ip_address" required id="id_device_ip_address" />',
-            html=True,
-        )
+        # (not comparing HTML directly because https://docs.djangoproject.com/en/5.1/releases/5.1.5/
+        # added a maxlength attribute)
+        soup = self.get_soup(response.content)
+        input = soup.find("input", {"name": "device_ip_address"})
+        self.assertEqual(input["type"], "text")
+        self.assertEqual(input["required"], "")
+        self.assertEqual(input["id"], "id_device_ip_address")
 
     def test_post_invalid_form(self):
         response = self.client.post(

wagtail/contrib/forms/tests/test_views.py

@@ -1973,6 +1973,52 @@ class TestDuplicateFormFieldLabels(WagtailTestUtils, TestCase):
             text="There is another field with the label Test field, please change one of them.",
         )
 
+    def test_adding_duplicate_form_labels_with_custom_related_name(self):
+        """
+        Ensure duplicate field names are checked, even if a custom related_name is used.
+        ``FormPageWithCustomSubmission`` uses the related_name `custom_form_fields`.
+        """
+
+        post_data = {
+            "title": "Drink selection",
+            "content": "Some content",
+            "slug": "drink-selection",
+            "custom_form_fields-TOTAL_FORMS": "3",
+            "custom_form_fields-INITIAL_FORMS": "3",
+            "custom_form_fields-MIN_NUM_FORMS": "0",
+            "custom_form_fields-MAX_NUM_FORMS": "1000",
+            # Duplicate field labels
+            "custom_form_fields-0-id": "",
+            "custom_form_fields-0-label": "chocolate",
+            "custom_form_fields-0-field_type": "singleline",
+            "custom_form_fields-1-id": "",
+            "custom_form_fields-1-label": "chocolate",
+            "custom_form_fields-1-field_type": "singleline",
+            # Unique field label
+            "custom_form_fields-2-id": "",
+            "custom_form_fields-2-label": "coffee",
+            "custom_form_fields-2-field_type": "singleline",
+        }
+
+        response = self.client.post(
+            reverse(
+                "wagtailadmin_pages:add",
+                args=(
+                    "tests",
+                    "formpagewithcustomsubmission",
+                    self.root_page.id,
+                ),
+            ),
+            post_data,
+        )
+
+        self.assertEqual(response.status_code, 200)
+
+        self.assertContains(
+            response,
+            text="There is another field with the label chocolate, please change one of them.",
+        )
+
 
 class TestPreview(WagtailTestUtils, TestCase):
     post_data = {
@@ -2085,6 +2131,35 @@ class TestFormPageCreate(WagtailTestUtils, TestCase):
             response, reverse("wagtailadmin_pages:edit", args=(page.id,))
         )
 
+    def test_form_page_creation_error_with_custom_clean_method(self):
+        """
+        CustomFormPageSubmission uses a custom `base_form_class` with a clean method
+        that will raise a ValidationError if the from email contains 'example.com'.
+        """
+
+        post_data = {
+            "title": "Drink selection",
+            "slug": "drink-selection",
+            "from_address": "bad@example.com",
+        }
+
+        response = self.client.post(
+            reverse(
+                "wagtailadmin_pages:add",
+                args=("tests", "formpagewithcustomsubmission", self.root_page.id),
+            ),
+            post_data,
+        )
+
+        self.assertEqual(response.status_code, 200)
+
+        self.assertContains(
+            response, "The page could not be created due to validation errors"
+        )
+        self.assertContains(
+            response, "<li>Email cannot be from example.com</li>", count=1
+        )
+
 
 class TestFormPageEdit(WagtailTestUtils, TestCase):
     def setUp(self):

wagtail/contrib/frontend_cache/tasks.py

@@ -0,0 +1,83 @@
+import logging
+import re
+from collections import defaultdict
+from urllib.parse import urlsplit, urlunsplit
+
+from django.conf import settings
+from django_tasks import task
+
+from wagtail.coreutils import get_content_languages
+
+from .utils import get_backends
+
+logger = logging.getLogger("wagtail.frontendcache")
+
+
+@task()
+def purge_urls_from_cache_task(urls, backend_settings=None, backends=None):
+    if not urls:
+        return
+
+    backends = get_backends(backend_settings, backends)
+
+    # If no backends are configured, there's nothing to do
+    if not backends:
+        return
+
+    # Convert each url to urls one for each managed language (WAGTAILFRONTENDCACHE_LANGUAGES setting).
+    # The managed languages are common to all the defined backends.
+    # This depends on settings.USE_I18N
+    # If WAGTAIL_I18N_ENABLED is True, this defaults to WAGTAIL_CONTENT_LANGUAGES
+    wagtail_i18n_enabled = getattr(settings, "WAGTAIL_I18N_ENABLED", False)
+    content_languages = get_content_languages() if wagtail_i18n_enabled else {}
+    languages = getattr(
+        settings, "WAGTAILFRONTENDCACHE_LANGUAGES", list(content_languages.keys())
+    )
+    if settings.USE_I18N and languages:
+        langs_regex = "^/(%s)/" % "|".join(languages)
+        new_urls = []
+
+        # Purge the given url for each managed language
+        for isocode in languages:
+            for url in urls:
+                up = urlsplit(url)
+                new_url = urlunsplit(
+                    (
+                        up.scheme,
+                        up.netloc,
+                        re.sub(langs_regex, "/%s/" % isocode, up.path),
+                        up.query,
+                        up.fragment,
+                    )
+                )
+
+                # Check for best performance. True if re.sub found no match
+                # It happens when i18n_patterns was not used in urls.py to serve content for different languages from different URLs
+                if new_url in new_urls:
+                    continue
+
+                new_urls.append(new_url)
+
+        urls = new_urls
+
+    urls_by_hostname = defaultdict(list)
+
+    for url in urls:
+        urls_by_hostname[urlsplit(url).netloc].append(url)
+
+    for hostname, urls in urls_by_hostname.items():
+        backends_for_hostname = {
+            backend_name: backend
+            for backend_name, backend in backends.items()
+            if backend.invalidates_hostname(hostname)
+        }
+
+        if not backends_for_hostname:
+            logger.info("Unable to find purge backend for %s", hostname)
+            continue
+
+        for backend_name, backend in backends_for_hostname.items():
+            for url in urls:
+                logger.info("[%s] Purging URL: %s", backend_name, url)
+
+            backend.purge_batch(urls)

wagtail/contrib/frontend_cache/tests.py

@@ -447,32 +447,37 @@ class TestCachePurgingFunctions(TestCase):
         PURGED_URLS.clear()
 
     def test_purge_url_from_cache(self):
-        purge_url_from_cache("http://localhost/foo")
+        with self.captureOnCommitCallbacks(execute=True):
+            purge_url_from_cache("http://localhost/foo")
         self.assertEqual(PURGED_URLS, {"http://localhost/foo"})
 
     def test_purge_urls_from_cache(self):
-        purge_urls_from_cache(["http://localhost/foo", "http://localhost/bar"])
+        with self.captureOnCommitCallbacks(execute=True):
+            purge_urls_from_cache(["http://localhost/foo", "http://localhost/bar"])
         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/")
-        purge_page_from_cache(page)
+        with self.captureOnCommitCallbacks(execute=True):
+            page = EventIndex.objects.get(url_path="/home/events/")
+            purge_page_from_cache(page)
         self.assertEqual(
             PURGED_URLS, {"http://localhost/events/", "http://localhost/events/past/"}
         )
 
     def test_purge_pages_from_cache(self):
-        purge_pages_from_cache(EventIndex.objects.all())
+        with self.captureOnCommitCallbacks(execute=True):
+            purge_pages_from_cache(EventIndex.objects.all())
         self.assertEqual(
             PURGED_URLS, {"http://localhost/events/", "http://localhost/events/past/"}
         )
 
     def test_purge_batch(self):
-        batch = PurgeBatch()
-        page = EventIndex.objects.get(url_path="/home/events/")
-        batch.add_page(page)
-        batch.add_url("http://localhost/foo")
-        batch.purge()
+        with self.captureOnCommitCallbacks(execute=True):
+            batch = PurgeBatch()
+            page = EventIndex.objects.get(url_path="/home/events/")
+            batch.add_page(page)
+            batch.add_url("http://localhost/foo")
+            batch.purge()
 
         self.assertEqual(
             PURGED_URLS,
@@ -493,7 +498,8 @@ class TestCachePurgingFunctions(TestCase):
     )
     def test_invalidate_specific_location(self):
         with self.assertLogs(level="INFO") as log_output:
-            purge_url_from_cache("http://localhost/foo")
+            with self.captureOnCommitCallbacks(execute=True):
+                purge_url_from_cache("http://localhost/foo")
 
         self.assertEqual(PURGED_URLS, set())
         self.assertIn(
@@ -501,7 +507,8 @@ class TestCachePurgingFunctions(TestCase):
             log_output.output[0],
         )
 
-        purge_url_from_cache("http://example.com/foo")
+        with self.captureOnCommitCallbacks(execute=True):
+            purge_url_from_cache("http://example.com/foo")
         self.assertEqual(PURGED_URLS, {"http://example.com/foo"})
 
 
@@ -520,10 +527,11 @@ class TestCloudflareCachePurgingFunctions(TestCase):
         PURGED_URLS.clear()
 
     def test_cloudflare_purge_batch_chunked(self):
-        batch = PurgeBatch()
-        urls = [f"https://localhost/foo{i}" for i in range(1, 65)]
-        batch.add_urls(urls)
-        batch.purge()
+        with self.captureOnCommitCallbacks(execute=True):
+            batch = PurgeBatch()
+            urls = [f"https://localhost/foo{i}" for i in range(1, 65)]
+            batch.add_urls(urls)
+            batch.purge()
 
         self.assertCountEqual(PURGED_URLS, set(urls))
 
@@ -543,24 +551,27 @@ class TestCachePurgingSignals(TestCase):
         PURGED_URLS.clear()
 
     def test_purge_on_publish(self):
-        page = EventIndex.objects.get(url_path="/home/events/")
-        page.save_revision().publish()
+        with self.captureOnCommitCallbacks(execute=True):
+            page = EventIndex.objects.get(url_path="/home/events/")
+            page.save_revision().publish()
         self.assertEqual(
             PURGED_URLS, {"http://localhost/events/", "http://localhost/events/past/"}
         )
 
     def test_purge_on_unpublish(self):
-        page = EventIndex.objects.get(url_path="/home/events/")
-        page.unpublish()
+        with self.captureOnCommitCallbacks(execute=True):
+            page = EventIndex.objects.get(url_path="/home/events/")
+            page.unpublish()
         self.assertEqual(
             PURGED_URLS, {"http://localhost/events/", "http://localhost/events/past/"}
         )
 
     def test_purge_with_unroutable_page(self):
-        root = Page.objects.get(url_path="/")
-        page = EventIndex(title="new top-level page")
-        root.add_child(instance=page)
-        page.save_revision().publish()
+        with self.captureOnCommitCallbacks(execute=True):
+            root = Page.objects.get(url_path="/")
+            page = EventIndex(title="new top-level page")
+            root.add_child(instance=page)
+            page.save_revision().publish()
         self.assertEqual(PURGED_URLS, set())
 
     @override_settings(
@@ -569,8 +580,9 @@ class TestCachePurgingSignals(TestCase):
         WAGTAILFRONTENDCACHE_LANGUAGES=["en", "fr", "pt-br"],
     )
     def test_purge_on_publish_in_multilang_env(self):
-        page = EventIndex.objects.get(url_path="/home/events/")
-        page.save_revision().publish()
+        with self.captureOnCommitCallbacks(execute=True):
+            page = EventIndex.objects.get(url_path="/home/events/")
+            page.save_revision().publish()
 
         self.assertEqual(
             PURGED_URLS,
@@ -591,8 +603,9 @@ class TestCachePurgingSignals(TestCase):
         WAGTAIL_CONTENT_LANGUAGES=[("en", "English"), ("fr", "French")],
     )
     def test_purge_on_publish_with_i18n_enabled(self):
-        page = EventIndex.objects.get(url_path="/home/events/")
-        page.save_revision().publish()
+        with self.captureOnCommitCallbacks(execute=True):
+            page = EventIndex.objects.get(url_path="/home/events/")
+            page.save_revision().publish()
 
         self.assertEqual(
             PURGED_URLS,
@@ -610,9 +623,10 @@ class TestCachePurgingSignals(TestCase):
         WAGTAIL_CONTENT_LANGUAGES=[("en", "English"), ("fr", "French")],
     )
     def test_purge_on_publish_without_i18n_enabled(self):
-        # It should ignore WAGTAIL_CONTENT_LANGUAGES as WAGTAIL_I18N_ENABLED isn't set
-        page = EventIndex.objects.get(url_path="/home/events/")
-        page.save_revision().publish()
+        with self.captureOnCommitCallbacks(execute=True):
+            # It should ignore WAGTAIL_CONTENT_LANGUAGES as WAGTAIL_I18N_ENABLED isn't set
+            page = EventIndex.objects.get(url_path="/home/events/")
+            page.save_revision().publish()
         self.assertEqual(
             PURGED_URLS,
             {"http://localhost/en/events/", "http://localhost/en/events/past/"},
@@ -696,7 +710,8 @@ class TestPurgeBatchClass(TestCase):
         batch.add_url("http://localhost/events/")
 
         with self.assertLogs(level="ERROR") as log_output:
-            batch.purge(backend_settings=backend_settings)
+            with self.captureOnCommitCallbacks(execute=True):
+                batch.purge(backend_settings=backend_settings)
 
         self.assertIn(
             "Couldn't purge 'http://localhost/events/' from Cloudflare. HTTPError: 500",

wagtail/contrib/frontend_cache/utils.py

@@ -1,14 +1,9 @@
 import logging
-import re
-from collections import defaultdict
-from urllib.parse import urlsplit, urlunsplit
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.module_loading import import_string
 
-from wagtail.coreutils import get_content_languages
-
 logger = logging.getLogger("wagtail.frontendcache")
 
 
@@ -64,72 +59,9 @@ def purge_url_from_cache(url, backend_settings=None, backends=None):
 
 
 def purge_urls_from_cache(urls, backend_settings=None, backends=None):
-    if not urls:
-        return
-
-    backends = get_backends(backend_settings, backends)
-
-    # If no backends are configured, there's nothing to do
-    if not backends:
-        return
-
-    # Convert each url to urls one for each managed language (WAGTAILFRONTENDCACHE_LANGUAGES setting).
-    # The managed languages are common to all the defined backends.
-    # This depends on settings.USE_I18N
-    # If WAGTAIL_I18N_ENABLED is True, this defaults to WAGTAIL_CONTENT_LANGUAGES
-    wagtail_i18n_enabled = getattr(settings, "WAGTAIL_I18N_ENABLED", False)
-    content_languages = get_content_languages() if wagtail_i18n_enabled else {}
-    languages = getattr(
-        settings, "WAGTAILFRONTENDCACHE_LANGUAGES", list(content_languages.keys())
-    )
-    if settings.USE_I18N and languages:
-        langs_regex = "^/(%s)/" % "|".join(languages)
-        new_urls = []
-
-        # Purge the given url for each managed language
-        for isocode in languages:
-            for url in urls:
-                up = urlsplit(url)
-                new_url = urlunsplit(
-                    (
-                        up.scheme,
-                        up.netloc,
-                        re.sub(langs_regex, "/%s/" % isocode, up.path),
-                        up.query,
-                        up.fragment,
-                    )
-                )
-
-                # Check for best performance. True if re.sub found no match
-                # It happens when i18n_patterns was not used in urls.py to serve content for different languages from different URLs
-                if new_url in new_urls:
-                    continue
-
-                new_urls.append(new_url)
-
-        urls = new_urls
-
-    urls_by_hostname = defaultdict(list)
-
-    for url in urls:
-        urls_by_hostname[urlsplit(url).netloc].append(url)
-
-    for hostname, urls in urls_by_hostname.items():
-        backends_for_hostname = {
-            backend_name: backend
-            for backend_name, backend in backends.items()
-            if backend.invalidates_hostname(hostname)
-        }
-
-        if not backends_for_hostname:
-            logger.info("Unable to find purge backend for %s", hostname)
-            continue
-
-        for backend_name, backend in backends_for_hostname.items():
-            for url in urls:
-                logger.info("[%s] Purging URL: %s", backend_name, url)
+    from .tasks import purge_urls_from_cache_task
 
-            backend.purge_batch(urls)
+    purge_urls_from_cache_task.enqueue(list(urls), backend_settings, backends)
 
 
 def _get_page_cached_urls(page):

wagtail/contrib/redirects/base_formats.py

@@ -1,8 +1,6 @@
 import csv
 from io import BytesIO, StringIO
 
-import openpyxl
-
 
 class Dataset(list):
     def __init__(self, rows=(), headers=None):
@@ -66,6 +64,8 @@ class XLSX:
         """
         Create dataset from the first sheet of a xlsx workbook.
         """
+        import openpyxl
+
         workbook = openpyxl.load_workbook(BytesIO(data), read_only=True, data_only=True)
         sheet = workbook.worksheets[0]
         try:

wagtail/contrib/redirects/locale/ar/LC_MESSAGES/django.po

@@ -99,6 +99,9 @@ msgstr "هل أنت متأكد من أنك تريد حذف إعادة التوج
 msgid "Yes, delete"
 msgstr "نعم احذف"
 
+msgid "Cancel"
+msgstr "إلغاء"
+
 msgid "Preview"
 msgstr "نظر مقدم"
 

wagtail/contrib/redirects/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"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Wagtail redirects"
 msgstr ""
 
-#: filters.py:12 views.py:102 views.py:119
+#: filters.py:12 views.py:100 views.py:117
 msgid "Type"
 msgstr ""
 
@@ -123,19 +123,14 @@ msgstr ""
 msgid "redirects"
 msgstr ""
 
-#: templates/wagtailredirects/add.html:3 templates/wagtailredirects/add.html:5
-#: views.py:70
-msgid "Add redirect"
-msgstr ""
-
-#: templates/wagtailredirects/choose_import_file.html:3 views.py:79
+#: templates/wagtailredirects/choose_import_file.html:3 views.py:77
 #: wagtail_hooks.py:34
 msgid "Redirects"
 msgstr ""
 
 #: templates/wagtailredirects/choose_import_file.html:6
 #: templates/wagtailredirects/confirm_import.html:6
-#: templates/wagtailredirects/import_summary.html:5 views.py:130
+#: templates/wagtailredirects/import_summary.html:5 views.py:128
 msgid "Import redirects"
 msgstr ""
 
@@ -157,17 +152,9 @@ msgid "Delete redirect %(title)s"
 msgstr ""
 
 #: templates/wagtailredirects/confirm_delete.html:5
-msgid "Delete"
-msgstr ""
-
-#: templates/wagtailredirects/confirm_delete.html:9
 msgid "Are you sure you want to delete this redirect?"
 msgstr ""
 
-#: templates/wagtailredirects/confirm_delete.html:12
-msgid "Yes, delete"
-msgstr ""
-
 #: templates/wagtailredirects/confirm_import.html:4
 #: templates/wagtailredirects/confirm_import.html:7
 msgid "Confirm import"
@@ -196,11 +183,11 @@ msgid ""
 "Found %(total)s redirects, created %(successes)s and found %(errors)s errors."
 msgstr ""
 
-#: templates/wagtailredirects/import_summary.html:17 views.py:84 views.py:116
+#: templates/wagtailredirects/import_summary.html:17 views.py:82 views.py:114
 msgid "From"
 msgstr ""
 
-#: templates/wagtailredirects/import_summary.html:18 views.py:96 views.py:118
+#: templates/wagtailredirects/import_summary.html:18 views.py:94 views.py:116
 msgid "To"
 msgstr ""
 
@@ -224,57 +211,57 @@ msgid ""
 "href=\"%(wagtailredirects_add_redirect_url)s\">add one</a>?"
 msgstr ""
 
-#: views.py:90 views.py:117
+#: views.py:68
+msgid "Add redirect"
+msgstr ""
+
+#: views.py:88 views.py:115
 msgid "Site"
 msgstr ""
 
-#: views.py:148
+#: views.py:146
 msgid "The redirect could not be saved due to errors."
 msgstr ""
 
-#: views.py:153
+#: views.py:150
 #, python-format
 msgid "Redirect '%(redirect_title)s' updated."
 msgstr ""
 
-#: views.py:190
+#: views.py:183
 #, python-format
 msgid "Redirect '%(redirect_title)s' deleted."
 msgstr ""
 
-#: views.py:217
-#, python-format
-msgid "Redirect '%(redirect_title)s' added."
-msgstr ""
-
-#: views.py:222
-msgid "Edit"
+#: views.py:196
+msgid "The redirect could not be created due to errors."
 msgstr ""
 
-#: views.py:229
-msgid "The redirect could not be created due to errors."
+#: views.py:200
+#, python-format
+msgid "Redirect '%(redirect_title)s' added."
 msgstr ""
 
-#: views.py:273
+#: views.py:235
 msgid "Search redirects"
 msgstr ""
 
-#: views.py:287
+#: views.py:249
 #, python-format
 msgid "File format of type \"%(extension)s\" is not supported"
 msgstr ""
 
-#: views.py:304
+#: views.py:266
 #, python-format
 msgid "Imported file has a wrong encoding: %(error_message)s"
 msgstr ""
 
-#: views.py:311
+#: views.py:273
 #, python-format
 msgid "%(error)s encountered while trying to read file: %(filename)s"
 msgstr ""
 
-#: views.py:402
+#: views.py:364
 #, python-format
 msgid "Imported %(total)d redirect"
 msgid_plural "Imported %(total)d redirects"

wagtail/contrib/redirects/templates/wagtailredirects/add.html

@@ -1,24 +1 @@
-{% extends "wagtailadmin/generic/form.html" %}
-{% load i18n wagtailadmin_tags %}
-{% block titletag %}{% trans "Add redirect" %}{% endblock %}
-{% block content %}
-    {% trans "Add redirect" as add_red_str %}
-    {% include "wagtailadmin/shared/header.html" with title=add_red_str icon="redirect" %}
-
-    {% include "wagtailadmin/shared/non_field_errors.html" %}
-
-    <form action="{% url 'wagtailredirects:add' %}" method="POST" class="nice-padding" novalidate>
-        {% csrf_token %}
-
-        <ul class="fields">
-            {% for field in form.visible_fields %}
-                <li>{% formattedfield field %}</li>
-            {% endfor %}
-        </ul>
-
-        {% block footer %}
-            {{ block.super }}
-        {% endblock %}
-    </form>
-
-{% endblock %}
+{% extends "wagtailadmin/generic/create.html" %}