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

wagtail/blocks/list_block.py

@@ -427,6 +427,7 @@ class ListBlock(Block):
                 child_block = kwargs.get("child_block")
                 if isinstance(child_block, Block):
                     block_id = lookup.add_block(child_block)
+                    kwargs = kwargs.copy()  # avoid mutating the original kwargs stored in self._constructor_args
                     kwargs["child_block"] = block_id
 
         return path, args, kwargs

wagtail/contrib/forms/tests/test_views.py

@@ -552,15 +552,39 @@ class TestFormsSubmissionsList(WagtailTestUtils, TestCase):
         self.assertEqual(len(response.context["data_rows"]), 1)
 
     def test_list_submissions_filtering_range(self):
-        response = self.client.get(
-            reverse("wagtailforms:list_submissions", args=(self.form_page.id,)),
-            {"date_from": "12/31/2013", "date_to": "01/02/2014"},
-        )
+        url = reverse("wagtailforms:list_submissions", args=(self.form_page.id,))
+        params = {"date_from": "12/31/2013", "date_to": "01/02/2014"}
+        response = self.client.get(url, params)
 
         # Check response
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "wagtailforms/submissions_index.html")
         self.assertEqual(len(response.context["data_rows"]), 1)
+        soup = self.get_soup(response.content)
+        next_input = soup.select_one('input[name="next"]')
+        self.assertIsNotNone(next_input)
+        self.assertEqual(next_input["value"], f"{url}?{urlencode(params)}")
+
+    def test_list_submissions_filtering_results(self):
+        index_url = reverse("wagtailforms:list_submissions", args=(self.form_page.id,))
+        results_url = reverse(
+            "wagtailforms:list_submissions_results",
+            args=(self.form_page.id,),
+        )
+        params = {"date_from": "12/31/2013", "date_to": "01/02/2014"}
+        response = self.client.get(results_url, params)
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateNotUsed(response, "wagtailforms/submissions_index.html")
+        self.assertTemplateUsed(response, "wagtailforms/list_submissions.html")
+        self.assertEqual(len(response.context["data_rows"]), 1)
+        soup = self.get_soup(response.content)
+        next_input = soup.select_one('input[name="next"]')
+        self.assertIsNotNone(next_input)
+        # The next URL should point to the index page (instead of results page)
+        # with the same query params to preserve the filter
+        self.assertEqual(next_input["value"], f"{index_url}?{urlencode(params)}")
 
     def test_list_submissions_pagination(self):
         self.make_list_submissions()

wagtail/contrib/forms/views.py

@@ -363,5 +363,5 @@ class SubmissionsListView(SpreadsheetExportMixin, BaseListingView):
                 }
             )
 
-        context["next_url"] = self.request.get_full_path()
+        context["next_url"] = f"{self.get_index_url()}?{self.request.GET.urlencode()}"
         return context

wagtail/models/__init__.py

@@ -48,6 +48,7 @@ from django.utils import translation as translation
 from django.utils.cache import patch_cache_control
 from django.utils.encoding import force_bytes, force_str
 from django.utils.functional import Promise, cached_property
+from django.utils.log import log_response
 from django.utils.module_loading import import_string
 from django.utils.text import capfirst, slugify
 from django.utils.translation import gettext_lazy as _
@@ -2174,13 +2175,15 @@ class Page(AbstractPage, index.Indexed, ClusterableModel, metaclass=PageBase):
         """
         allowed_methods = self.allowed_http_method_names()
         if request.method not in allowed_methods:
-            logger.warning(
+            response = HttpResponseNotAllowed(allowed_methods)
+            log_response(
                 "Method Not Allowed (%s): %s",
                 request.method,
                 request.path,
-                extra={"status_code": 405, "request": request},
+                request=request,
+                response=response,
             )
-            return HttpResponseNotAllowed(allowed_methods)
+            return response
 
     def handle_options_request(self, request, *args, **kwargs):
         """

wagtail/test/settings.py

@@ -49,8 +49,12 @@ if DATABASES["default"]["ENGINE"] == "sql_server.pyodbc":
 
 # explicitly set charset / collation to utf8 on mysql
 if DATABASES["default"]["ENGINE"] == "django.db.backends.mysql":
-    DATABASES["default"]["TEST"]["CHARSET"] = "utf8"
-    DATABASES["default"]["TEST"]["COLLATION"] = "utf8_general_ci"
+    DATABASES["default"]["OPTIONS"] = {
+        "charset": "utf8mb4",
+        "collation": "utf8mb4_general_ci",
+    }
+    DATABASES["default"]["TEST"]["CHARSET"] = "utf8mb4"
+    DATABASES["default"]["TEST"]["COLLATION"] = "utf8mb4_general_ci"
 
 
 SECRET_KEY = "not needed"

wagtail/tests/test_streamfield.py

@@ -979,6 +979,54 @@ class TestDeconstructStreamFieldWithLookup(TestCase):
             },
         )
 
+    def test_deconstruct_with_listblock_with_child_block_kwarg_idempotence(self):
+        # See https://github.com/wagtail/wagtail/issues/13137. When a ListBlock is defined with
+        # a child_block keyword argument, its deconstruct_with_lookup method inserts that child
+        # block into the lookup to obtain an ID, and returns that ID as the child_block kwarg
+        # in its result. However, an implementation bug meant that this was mutating the kwargs
+        # dict stored in the block's _constructor_args attribute. As a result, subsequent calls
+        # to deconstruct_with_lookup (which happen routinely during makemigrations) would
+        # encounter the ID in child_block, leave it alone (because it isn't a block object as
+        # expected), and return that ID in the result without adding it to the lookup, messing
+        # up the ID sequence in the process.
+        field = StreamField(
+            [
+                ("heading", blocks.CharBlock(required=True)),
+                (
+                    "bullets",
+                    blocks.ListBlock(child_block=blocks.CharBlock(required=False)),
+                ),
+            ],
+            blank=True,
+        )
+        field.set_attributes_from_name("body")
+
+        expected_args = [
+            [
+                ("heading", 0),
+                ("bullets", 2),
+            ]
+        ]
+        expected_kwargs = {
+            "blank": True,
+            "block_lookup": {
+                0: ("wagtail.blocks.CharBlock", (), {"required": True}),
+                1: ("wagtail.blocks.CharBlock", (), {"required": False}),
+                2: ("wagtail.blocks.ListBlock", (), {"child_block": 1}),
+            },
+        }
+        name, path, args, kwargs = field.deconstruct()
+        self.assertEqual(name, "body")
+        self.assertEqual(path, "wagtail.fields.StreamField")
+        self.assertEqual(kwargs, expected_kwargs)
+        self.assertEqual(args, expected_args)
+
+        name, path, args, kwargs = field.deconstruct()
+        self.assertEqual(name, "body")
+        self.assertEqual(path, "wagtail.fields.StreamField")
+        self.assertEqual(kwargs, expected_kwargs)
+        self.assertEqual(args, expected_args)
+
     def test_deconstruct_with_listblock_subclass(self):
         # See https://github.com/wagtail/wagtail/issues/12164 - unlike StructBlock and StreamBlock,
         # ListBlock's deconstruct method doesn't reduce subclasses to the base ListBlock class.

{wagtail-6.4.1.dist-info → wagtail-6.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: wagtail
-Version: 6.4.1
+Version: 6.4.2
 Summary: A Django content management system.
 Home-page: https://wagtail.org/
 Author: Wagtail core team + contributors
@@ -37,23 +37,16 @@ Requires-Dist: django-taggit<7,>=5.0
 Requires-Dist: django-treebeard<5.0,>=4.5.1
 Requires-Dist: djangorestframework<4.0,>=3.15.1
 Requires-Dist: django-filter>=23.3
-Requires-Dist: draftjs-exporter<6.0,>=2.1.5
+Requires-Dist: draftjs_exporter<6.0,>=2.1.5
 Requires-Dist: Pillow<12.0.0,>=9.1.0
 Requires-Dist: beautifulsoup4<5,>=4.8
-Requires-Dist: Willow[heif]<2,>=1.8.0
+Requires-Dist: Willow[heif]<2,>=1.10.0
 Requires-Dist: requests<3.0,>=2.11.1
 Requires-Dist: openpyxl<4.0,>=3.0.10
 Requires-Dist: anyascii>=0.1.5
 Requires-Dist: telepath<1,>=0.3.1
 Requires-Dist: laces<0.2,>=0.1
 Requires-Dist: django-tasks<0.7,>=0.6.1
-Provides-Extra: docs
-Requires-Dist: pyenchant<4,>=3.1.1; extra == "docs"
-Requires-Dist: sphinxcontrib-spelling<8,>=7; extra == "docs"
-Requires-Dist: Sphinx>=7.3; extra == "docs"
-Requires-Dist: sphinx-autobuild>=0.6.0; extra == "docs"
-Requires-Dist: sphinx-wagtail-theme==6.5.0; extra == "docs"
-Requires-Dist: myst-parser==2.0.0; extra == "docs"
 Provides-Extra: testing
 Requires-Dist: python-dateutil>=2.7; extra == "testing"
 Requires-Dist: Jinja2<3.2,>=3.0; extra == "testing"
@@ -71,6 +64,25 @@ Requires-Dist: djhtml==3.0.6; extra == "testing"
 Requires-Dist: polib<2.0,>=1.1; extra == "testing"
 Requires-Dist: factory-boy>=3.2; extra == "testing"
 Requires-Dist: tblib<3.0,>=2.0; extra == "testing"
+Provides-Extra: docs
+Requires-Dist: pyenchant<4,>=3.1.1; extra == "docs"
+Requires-Dist: sphinxcontrib-spelling<8,>=7; extra == "docs"
+Requires-Dist: Sphinx>=7.3; extra == "docs"
+Requires-Dist: sphinx-autobuild>=0.6.0; extra == "docs"
+Requires-Dist: sphinx-wagtail-theme==6.5.0; extra == "docs"
+Requires-Dist: myst_parser==2.0.0; extra == "docs"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 Wagtail is an open source content management system built on Django, with a strong community and commercial support. It’s focused on user experience, and offers precise control for designers and developers.
 

{wagtail-6.4.1.dist-info → wagtail-6.4.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-wagtail/__init__.py,sha256=cKkoT7QEBp788U7c_1ydX2H72WezJwcfjjjuDM6xsQ0,724
+wagtail/__init__.py,sha256=6kAC5GDpHXRt2XNe1QfIMvT2viZuqmBiGFudQHszaeU,724
 wagtail/apps.py,sha256=38kXTdHoQzFnpUqDNxFpsqn2dut4V0u9rLOkhqCoYkc,713
 wagtail/compat.py,sha256=kK3I3oWKRatDu62zrZitqtLcxW5eVXg0Nnc5f_9nJEk,838
 wagtail/coreutils.py,sha256=8wQC7LCRJ3dCILhpAsODCDCxlU0x--6UXDVX4Tx3gnQ,20417
@@ -387,7 +387,7 @@ wagtail/admin/static/wagtailadmin/js/chooser-modal.js,sha256=xsI0wn2M1JTtvlIPZ2g
 wagtail/admin/static/wagtailadmin/js/chooser-widget-telepath.js,sha256=0myTII_jGu4g320xO_a9DVtKNoNWVetFmJYdg4khxYg,1589
 wagtail/admin/static/wagtailadmin/js/chooser-widget.js,sha256=6QeU2LKqS3m9bYTd6MqNrSSgM0NeuRu1xK7ZxKff8-U,1546
 wagtail/admin/static/wagtailadmin/js/comments.js,sha256=zhwZWIsExywGVsNJyNxp_1K0w2XOalECzT-hqMMY0h8,52907
-wagtail/admin/static/wagtailadmin/js/core.js,sha256=n7O7NmQWzNJSAv2kdxPoeCrRx_NwztN1Ej9hlhWoFVk,670561
+wagtail/admin/static/wagtailadmin/js/core.js,sha256=4H6sO1tcgo71REE3HaFolUhcLNZRfwXm0inxqo-uOFw,670565
 wagtail/admin/static/wagtailadmin/js/core.js.LICENSE.txt,sha256=sKbCnxKnzkZQ7Id26iMCn_-jm0zMDH0HG0Arzopv7og,452
 wagtail/admin/static/wagtailadmin/js/date-time-chooser.js,sha256=3hETl9qsULtkBwcnuZRFLahg4YggsY0xUeDD6SZUEYw,3376
 wagtail/admin/static/wagtailadmin/js/draftail.js,sha256=IB8bIrrGw6Za5HAAIi_DgSaU1LWaHi6oa01RWL5y9EE,294815
@@ -1040,7 +1040,7 @@ wagtail/blocks/__init__.py,sha256=VjRA2jnSMItNEqkMGtYQxFHzoefy8QbqTysjlFHnxpU,31
 wagtail/blocks/base.py,sha256=bnwGXbY4untnGdvuDcti720ekSuaBktqjOPVev62xGg,32714
 wagtail/blocks/definition_lookup.py,sha256=JkSwFcqEkavq-M6kWNfeDZtvIXnQJ58QT2FeaKrFPEA,3274
 wagtail/blocks/field_block.py,sha256=t9hdmfCvedAtJKzKzlx6b2_0-9Xc4tE5xN6p9dB3-20,32671
-wagtail/blocks/list_block.py,sha256=n3PXsnljlrEUrBu6MMK-uw1QAOziA_Ndp7rUzdN4LWI,18524
+wagtail/blocks/list_block.py,sha256=zqxCXaBZQCPRHiQnNLccPXr7CX1jFnpPAEW5iXjQAQY,18638
 wagtail/blocks/static_block.py,sha256=3XXU8AKEnazLaiCJX4BMMdaJd9B6LjB2BovtUbmhK-M,1914
 wagtail/blocks/stream_block.py,sha256=-IPO6fnHeb7OF0PO9PmUQ-LxUBeAdi9bpTCzCvRLO9g,32606
 wagtail/blocks/struct_block.py,sha256=-wXvi3AlkksrZbU9XkXQTaAhTUgT-6cs3xGacb1chs4,16380
@@ -1056,7 +1056,7 @@ wagtail/contrib/forms/models.py,sha256=IqLRh9a9W0hDsO2HUgwfAOUzKWqeaTMvP-KT8VLWV
 wagtail/contrib/forms/panels.py,sha256=zI3bFM1X5iT_fnxQUe5BWWN5iQKm6tEFEiaFhNRZcwk,1556
 wagtail/contrib/forms/urls.py,sha256=VZ4LDq6SkdEi3iXL7zoxDRSNZeGS5ZSeiNUsfqZ-nOI,776
 wagtail/contrib/forms/utils.py,sha256=Gu3WS-X37KQeDuHZliEwkhHJaqDgUwF1ObuVp3ai2fM,1279
-wagtail/contrib/forms/views.py,sha256=xOSyAMn0CpGpDWAMMlaVK4vBaJIzLBUpQlMikwaB1zU,13355
+wagtail/contrib/forms/views.py,sha256=-pBvZObLNKdwo7Hq5TiAXvrkstba0kKpm3-hjG3VZ18,13383
 wagtail/contrib/forms/wagtail_hooks.py,sha256=VbHWejKs7Pp-KXtrcIqWOS476hpK9UuWBn1XF8qLmug,876
 wagtail/contrib/forms/locale/af/LC_MESSAGES/django.mo,sha256=IT4kQ2iXzYtsLiFZcjhqZdbNqnigtbo1oWilPNx88L0,455
 wagtail/contrib/forms/locale/af/LC_MESSAGES/django.po,sha256=2560TzbawN8m3PHnxOpsgzNyovC3r5v9VE_0SB2-rwY,667
@@ -1190,7 +1190,7 @@ wagtail/contrib/forms/templates/wagtailforms/panels/form_responses_panel.html,sh
 wagtail/contrib/forms/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wagtail/contrib/forms/tests/test_forms.py,sha256=7tRUwJA2j9xzr28NpRC9hDYeOEfR1VTmBCPlny7UPVw,13634
 wagtail/contrib/forms/tests/test_models.py,sha256=lcifi_nJHHD9toYVtIY3P-zh-rdCTsLQTgxvAyFKbMM,32465
-wagtail/contrib/forms/tests/test_views.py,sha256=XA5a7eGtvEayt8nJxLGKWqHV81kkwxA0-UpYXEGVal8,84196
+wagtail/contrib/forms/tests/test_views.py,sha256=x8HSGzJHGB6hwGd5tyPuOTc1uYxabXMVhDmRCppVvPE,85504
 wagtail/contrib/forms/tests/utils.py,sha256=OESefxdqGRgL1lDItVPSFNw_FJNB4X0PvozdvAhrpkc,6043
 wagtail/contrib/frontend_cache/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wagtail/contrib/frontend_cache/apps.py,sha256=y-TyHADOpdCrIQ7zfnVD6OOxjo28lnBhPJeBtjlPih4,407
@@ -3047,7 +3047,7 @@ wagtail/migrations/0092_alter_collectionviewrestriction_password_and_more.py,sha
 wagtail/migrations/0093_uploadedfile.py,sha256=wCiFE4yhM3LQVVcVgZmAd5VNlYn0Z3ff98Eflx6SIzc,1787
 wagtail/migrations/0094_alter_page_locale.py,sha256=FNbFTK6DbW2HD9M8BYF7ZwTHJWSD4N6y984rXIp56Wo,528
 wagtail/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wagtail/models/__init__.py,sha256=9DEpGmha593zJfyGMAB4V14aaixD1Fs-QTzlNzB6lOg,181483
+wagtail/models/__init__.py,sha256=gYjJGEOT_5y7eddLab1xCdkV5r9EviROnUiL7ohuczc,181559
 wagtail/models/audit_log.py,sha256=bzxNClPCxflh7gYjMPO-Fx5KkFbFchkTgk8lx4skfgE,12268
 wagtail/models/collections.py,sha256=fUjsvN-SF9mML1ZpCXyn97zSU9sXxTejobEHwImh-CE,242
 wagtail/models/copying.py,sha256=LfmaoYySiIcIQdUDHtSL3TvSt1Z3MjGbXK2dr_9yxG0,3909
@@ -3556,7 +3556,7 @@ wagtail/test/manage.py,sha256=JaihE2eqQFMxzd83WWPE4DLnZbzq0bqEkozWAbe-xn8,255
 wagtail/test/middleware.py,sha256=Tvt43O8iGOFvK1tpZFKHQndiJPO5AcrvzqrTzBjuTuY,1395
 wagtail/test/non_root_urls.py,sha256=ZWPGHRmWHmx2Ext6S_TONDj4ZHdBt5BNZoULON1nDlA,556
 wagtail/test/numberformat.py,sha256=FBKsX_92H97xHnb4Er5mAH2i3oFSorCQnKdGcjHlcgE,3771
-wagtail/test/settings.py,sha256=7SdInlKbrArYMl2I_wmDrx7RybGCLI1hrKETmcgSl8Q,9749
+wagtail/test/settings.py,sha256=xb8uSrGnppkfApvnvV0w9C2wnaZh4VN_mOxOzu0njZc,9874
 wagtail/test/settings_ui.py,sha256=FtNeC3qofOBsdfNT2ES0CDtwPq8Kth1Ym_l0QM5ZspE,886
 wagtail/test/urls.py,sha256=OqO9tjttDsR04DFc5cPmVijFRnAJZiktLuUXSi8_Cok,2599
 wagtail/test/urls_multilang.py,sha256=Pfif5_J3mDcf-AJEADTsm2dfFTQQWOlLMZHdPg2P8eA,310
@@ -3802,7 +3802,7 @@ wagtail/tests/test_revision_model.py,sha256=dvW9fGG6-V2WeNWpsIm9fP3jtRmJ6wj6pgqM
 wagtail/tests/test_rich_text.py,sha256=bBTdI__z5QSq-Z3dPvGLUyHaodmi6mKMBl65dSrsJQw,17795
 wagtail/tests/test_signals.py,sha256=MTP1e3dEQLt-JbV41JRlIeCzx9-g6grAFtOJgpwsEFI,6122
 wagtail/tests/test_sites.py,sha256=syJCEPMHdKXfbxc_Vb7CH9ymuPVZiWDAae4JmJPmPx0,8488
-wagtail/tests/test_streamfield.py,sha256=74JCqS8drDfqb_ARbPAuM_lOeTWbG_m9sVG0zGs6WWI,39637
+wagtail/tests/test_streamfield.py,sha256=gUr5CtIJlpFr6diW0vqPkjLZn3AN55GqiugD4FNBLDY,41837
 wagtail/tests/test_telepath.py,sha256=muiOryoRmkISEHVu9GPSrKJEVB_EvpOufhvuJF-HrTk,10374
 wagtail/tests/test_tests.py,sha256=BAWYYlrFls1rHsqRVsh_b9eW43t6MaXiswI-CkUI6fs,18272
 wagtail/tests/test_translatablemixin.py,sha256=bCHX65L-3SMtgXU7XEdG0NYV4G5-V93TzzHX24ubcl8,10283
@@ -4012,9 +4012,9 @@ wagtail/utils/urlpatterns.py,sha256=RDhVScxdm-RV4HSMjWElyrbEoTPsXu841_SKMgoFKtY,
 wagtail/utils/utils.py,sha256=nQhfy-fOiZfUFr67kTX4nF_2VVH7_MDtjTDOzZdpPTE,1407
 wagtail/utils/version.py,sha256=jYCDKIGJD3bZHTpgXMXu14oSBArQnf2WVU979D8V4b0,1552
 wagtail/utils/widgets.py,sha256=lQIheCRHFKR05Kih7fZjMTJE8_eFFhobJtwOulnwhv4,1797
-wagtail-6.4.1.dist-info/LICENSE,sha256=0aiL7_RJ2YkOjscmRI7opwmuURrY6h8MR0B24nrdRQU,1512
-wagtail-6.4.1.dist-info/METADATA,sha256=8dYc0cS8egmwHl5jft3boYIMy-GYiE1X4RFGkEGVBVw,3546
-wagtail-6.4.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-wagtail-6.4.1.dist-info/entry_points.txt,sha256=R14Z0xKoufNcDaku0EWDKM-K8J4ap0EImO8C-df8HVM,53
-wagtail-6.4.1.dist-info/top_level.txt,sha256=zcKgvuRTi0gSgVzJ1qMoERCwhQ_i0n9bkyxza3oh9as,8
-wagtail-6.4.1.dist-info/RECORD,,
+wagtail-6.4.2.dist-info/licenses/LICENSE,sha256=0aiL7_RJ2YkOjscmRI7opwmuURrY6h8MR0B24nrdRQU,1512
+wagtail-6.4.2.dist-info/METADATA,sha256=_KSfjPskgPuasz3ELfB7-OKb8QReyFjFok6onZwvVjk,3794
+wagtail-6.4.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+wagtail-6.4.2.dist-info/entry_points.txt,sha256=R14Z0xKoufNcDaku0EWDKM-K8J4ap0EImO8C-df8HVM,53
+wagtail-6.4.2.dist-info/top_level.txt,sha256=zcKgvuRTi0gSgVzJ1qMoERCwhQ_i0n9bkyxza3oh9as,8
+wagtail-6.4.2.dist-info/RECORD,,

{wagtail-6.4.1.dist-info → wagtail-6.4.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.1)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any