wagtail 6.2.2__py3-none-any.whl → 6.2.3__py3-none-any.whl

wagtail/admin/tests/test_audit_log.py

@@ -1,7 +1,9 @@
 from datetime import timedelta
+from io import StringIO
 
 from django.conf import settings
 from django.contrib.auth.models import Group, Permission
+from django.core.management import call_command
 from django.test import TestCase
 from django.urls import reverse
 from django.utils import timezone
@@ -305,6 +307,26 @@ class TestAuditLogAdmin(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         response = self.client.get(reverse("wagtailadmin_reports:site_history"))
         self.assertContains(response, expected_deleted_string)
 
+    def test_page_history_after_revision_purge(self):
+        self._update_page(self.hello_page)
+        call_command("purge_revisions", days=0, stdout=StringIO())
+
+        history_url = reverse(
+            "wagtailadmin_pages:history", kwargs={"page_id": self.hello_page.id}
+        )
+
+        self.login(user=self.editor)
+
+        response = self.client.get(history_url)
+        self.assertEqual(response.status_code, 200)
+
+        self.assertContains(response, "Created", 1)
+        self.assertContains(response, "Draft saved", 2)
+        self.assertContains(response, "Locked", 1)
+        self.assertContains(response, "Unlocked", 1)
+        self.assertContains(response, "Page scheduled for publishing", 1)
+        self.assertContains(response, "Published", 1)
+
     def test_edit_form_has_history_link(self):
         self.hello_page.save_revision()
         self.login(user=self.editor)

wagtail/admin/tests/test_workflows.py

@@ -162,6 +162,33 @@ class TestWorkflowsIndexView(AdminTemplateTestUtils, WagtailTestUtils, TestCase)
         self.assertNotContains(response, "There are no enabled workflows.")
         self.assertContains(response, "test_workflow")
 
+    def test_multiple_snippets_assigned_to_workflow(self):
+        Workflow.objects.create(name="Nocontenttypes")
+        multi_ct_workflow = Workflow.objects.create(name="Multicontenttypes")
+        for model in [FullFeaturedSnippet, ModeratedModel]:
+            WorkflowContentType.objects.create(
+                workflow=multi_ct_workflow,
+                content_type=ContentType.objects.get_for_model(model),
+            )
+
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        soup = self.get_soup(response.content)
+        cells = [
+            text
+            for td in soup.select("td")
+            if (text := td.get_text(separator=" | ", strip=True))
+        ]
+        self.assertEqual(
+            cells,
+            [
+                "Multicontenttypes",
+                "0 pages | 2 snippet types",
+                "Nocontenttypes",
+                "0 pages | 0 snippet types",
+            ],
+        )
+
     def test_num_queries(self):
         self.create_workflows()
         self.get()

wagtail/admin/views/generic/history.py

@@ -165,6 +165,7 @@ class ActionColumn(Column):
 
         if (
             (url_name := self.url_names.get("revisions_unschedule"))
+            and instance.revision
             and instance.revision.approved_go_live_at
             and self.user_can_unschedule
         ):

wagtail/admin/views/workflows.py

@@ -4,7 +4,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
 from django.core.paginator import Paginator
 from django.db import transaction
-from django.db.models import Count, OuterRef, Prefetch
+from django.db.models import Count, Prefetch
 from django.db.models.functions import Lower
 from django.http import Http404, HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect, render
@@ -37,7 +37,6 @@ from wagtail.models import (
     Task,
     TaskState,
     Workflow,
-    WorkflowContentType,
     WorkflowState,
     WorkflowTask,
 )
@@ -146,10 +145,7 @@ class Index(IndexView):
 
     def get_base_queryset(self):
         queryset = super().get_base_queryset()
-        content_types = WorkflowContentType.objects.filter(
-            workflow=OuterRef("pk")
-        ).values_list("pk", flat=True)
-        queryset = queryset.annotate(content_types=Count(content_types))
+        queryset = queryset.annotate(content_types=Count("workflow_content_types"))
         return queryset.prefetch_related(
             "workflow_pages",
             "workflow_pages__page",

{wagtail-6.2.2.dist-info → wagtail-6.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail
-Version: 6.2.2
+Version: 6.2.3
 Summary: A Django content management system.
 Home-page: https://wagtail.org/
 Author: Wagtail core team + contributors
@@ -51,9 +51,8 @@ Requires-Dist: pyenchant (<4,>=3.1.1) ; extra == 'docs'
 Requires-Dist: sphinxcontrib-spelling (<8,>=7) ; extra == 'docs'
 Requires-Dist: Sphinx (>=7.0) ; extra == 'docs'
 Requires-Dist: sphinx-autobuild (>=0.6.0) ; extra == 'docs'
-Requires-Dist: sphinx-wagtail-theme (==6.3.0) ; extra == 'docs'
+Requires-Dist: sphinx-wagtail-theme (==6.4.0) ; extra == 'docs'
 Requires-Dist: myst-parser (==2.0.0) ; extra == 'docs'
-Requires-Dist: sphinx-copybutton (<1.0,>=0.5) ; extra == 'docs'
 Provides-Extra: testing
 Requires-Dist: python-dateutil (>=2.7) ; extra == 'testing'
 Requires-Dist: pytz (>=2014.7) ; extra == 'testing'

{wagtail-6.2.2.dist-info → wagtail-6.2.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-wagtail/__init__.py,sha256=z-jsHz9YF_wR8x_ZrnFd4vnfNVAg1feqkzbq28FLUow,724
+wagtail/__init__.py,sha256=nF1GK52NX4PquGTT1TBwc2MBR3D6zQpWjJVXx5TZzUI,724
 wagtail/apps.py,sha256=38kXTdHoQzFnpUqDNxFpsqn2dut4V0u9rLOkhqCoYkc,713
 wagtail/compat.py,sha256=L41FhlX4xy5KgTdJ63smtM78mtKf1mxkPeOs8kyOwS0,538
 wagtail/coreutils.py,sha256=HIE2FCgFgi9IfVIs85E8onbQIJFAij92XNdNFNUCb70,20655
@@ -388,7 +388,7 @@ wagtail/admin/static/wagtailadmin/js/comments.js,sha256=nwfjUdZ-klg_lLpnnw6Ui7bY
 wagtail/admin/static/wagtailadmin/js/core.js,sha256=l1gVCKhhFWMVVvwDfE5aqiqkSN275rCpYIVzNedSV64,99221
 wagtail/admin/static/wagtailadmin/js/core.js.LICENSE.txt,sha256=dTzaqHjW_XEepDXUcpWz5hu9q-A1Lxr6tE4l4xE3lhY,125
 wagtail/admin/static/wagtailadmin/js/date-time-chooser.js,sha256=3hETl9qsULtkBwcnuZRFLahg4YggsY0xUeDD6SZUEYw,3376
-wagtail/admin/static/wagtailadmin/js/draftail.js,sha256=F5FSW9rcI_bbLYvLUo_wVdYq3nVCVz6u5gvncjzpUmY,293906
+wagtail/admin/static/wagtailadmin/js/draftail.js,sha256=bA1n48GDvpTHvJxsTQQJjXdEuazbiC-bmmzXggRn0nk,293931
 wagtail/admin/static/wagtailadmin/js/draftail.js.LICENSE.txt,sha256=97l5UAKNdHRm-wg_QYro4Ch4ElJtzAVshVlxSIbL9z8,255
 wagtail/admin/static/wagtailadmin/js/expanding-formset.js,sha256=vDyyVEGdfsnBlEDHAeOokwDZMHTCWkcyjvoD2G1NgKQ,1594
 wagtail/admin/static/wagtailadmin/js/filtered-select.js,sha256=LXL9VQc8RQmpz1jy1Rx5HidtmoPWu-YZR63CvYdPf0I,2197
@@ -854,7 +854,7 @@ wagtail/admin/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 wagtail/admin/tests/benches.py,sha256=7zdQSI4Ns0IV2u3WGQTsz25MmMHoT4HEpfii1n4XtQ8,3023
 wagtail/admin/tests/test_account_management.py,sha256=UAvHfLbNB3BMj2DEOKNM8uuxKm8JkkNawNS9ar73fso,38025
 wagtail/admin/tests/test_admin_search.py,sha256=tZv6zyCEr6xaiUeCx1N1CFKFfXfnObAEqKRtUjd25Q0,7359
-wagtail/admin/tests/test_audit_log.py,sha256=Hx9prQt1FRd34YFQ1caGUigYtDMmBLEdVP847RBjbGM,18301
+wagtail/admin/tests/test_audit_log.py,sha256=puQf3hDLwojFbUf1eRdQ-JI2FkHLR9YD99-SjONTu0s,19141
 wagtail/admin/tests/test_buttons_hooks.py,sha256=VYFuYBa1BiffKmeMGaicvyBsqUyWuIINC-ZGnz9WRF0,20502
 wagtail/admin/tests/test_checks.py,sha256=SrywlN77bD_ot6WWO6Ng3YdXuFg-FK7YyBcaeNH9Z6w,4546
 wagtail/admin/tests/test_collections_views.py,sha256=x6Y6GCsi8sIFCN9MZmJxnsjlKf8wa4rWNVjDWkm_IfU,31701
@@ -887,7 +887,7 @@ wagtail/admin/tests/test_views.py,sha256=eYpa4IC1ipWcl8f3LXEBlp8sJrbvg80pQT12tg6
 wagtail/admin/tests/test_views_generic.py,sha256=HrCYFQlj__hOuNcFNG4GAjzQzUzOsFtPqVO0MbP9_wA,2931
 wagtail/admin/tests/test_whats_new.py,sha256=Vptrf94ilJephOP3O7s1FKLtjNxFLCne6Bi4c_VlJzw,5570
 wagtail/admin/tests/test_widgets.py,sha256=3NIcu5Ktx6i5kAn8kSdW3HBg-SSVi8BspR-THj8aQ0Y,24656
-wagtail/admin/tests/test_workflows.py,sha256=b2SF2oQV1-eYr2J0GXEowhUjBd5v_wKN3wnpnVKZbXE,177103
+wagtail/admin/tests/test_workflows.py,sha256=XaBR7iaNzz6eAUeLTRc8kr73OOjBXC53QrxjIKnvt0k,178059
 wagtail/admin/tests/tests.py,sha256=GoPO8R3hdX1DpHIugy_8fvL0sGSybesVEAL_BRoyvLE,21278
 wagtail/admin/tests/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wagtail/admin/tests/api/test_documents.py,sha256=2dfjTi6Bj3otRQ-ok9f3rwl-HpSmprfcmhWyYPDnXcs,5051
@@ -955,7 +955,7 @@ wagtail/admin/views/home.py,sha256=u88JvZdh_fjMqvM2l2PKx8HhcURZemOEBhuzr5MKwTQ,1
 wagtail/admin/views/mixins.py,sha256=SaIe2YwuRFK7segVdIRaughf3_xsAgV5zAV2HTiTRhA,12975
 wagtail/admin/views/page_privacy.py,sha256=CBDaf8ElLesuco9Z3WLqdscPtoDRiGmxLPPWmWjHT7Q,3472
 wagtail/admin/views/tags.py,sha256=ZxV-Nzme28b8WaKTk96SFiFOKd_qS2SiQOoaOFUJwjE,812
-wagtail/admin/views/workflows.py,sha256=c63MZnFgc--j0Ijbh7MvSdFCPjsNfWtaBSqt6nWhJmc,34948
+wagtail/admin/views/workflows.py,sha256=EQIz1UR8QRniKr6X2iQ7LttPZ34i4Y5myfJ47FcconY,34789
 wagtail/admin/views/bulk_action/__init__.py,sha256=vvb1oKmExfxl6cd6g7YaCO4LSwxWNoRFdkqgemDBNeI,106
 wagtail/admin/views/bulk_action/base_bulk_action.py,sha256=UuidpHVm3uQTI6zRYxwSgxZNkAVP_XCWhkCEMW0Wu1s,5201
 wagtail/admin/views/bulk_action/dispatcher.py,sha256=fqhOJ3tyRwIDP474vewlsAq1FgP48AgKOvdiySxDlto,504
@@ -963,7 +963,7 @@ wagtail/admin/views/bulk_action/registry.py,sha256=e9-rN9TdHUmRwDfTeauvPUjE6p3ip
 wagtail/admin/views/generic/__init__.py,sha256=XSpUylwSEv32pR3pVZmF6lo6KGBqthS6b3y5neXvsW4,730
 wagtail/admin/views/generic/base.py,sha256=c9kgi1JdtUUEyRBqYulJRsiD3SFC0zPDZwCCFRRaP7I,17737
 wagtail/admin/views/generic/chooser.py,sha256=pjOYGcYBHc1ZkZJ4LWcHkoGNQ7U7GdKBsJZ0vyOO4kc,18061
-wagtail/admin/views/generic/history.py,sha256=YgY6zgT_v3PK9gOZInZQEQd75hyiKJhhJ4iuErE-rTQ,17651
+wagtail/admin/views/generic/history.py,sha256=XGbu1HbAj3N-NYEeC90_O7sWilaqRqz2d-6G3LgXeCk,17685
 wagtail/admin/views/generic/lock.py,sha256=dvZ613n3itNAhO3zdQzGRewm2kH-dyemx-LSuUC2AHM,1435
 wagtail/admin/views/generic/mixins.py,sha256=FqHQOqwPPqQxGRqJEZx7hW2cIuUvZRrpFfuJrLTfWDE,29915
 wagtail/admin/views/generic/models.py,sha256=ugKntUQWiifWqMGW9YNimpFfxUT0o988LIosY8M0Tuk,51058
@@ -4009,9 +4009,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=ibAvxHCjNw06bMlTD7wvrwmGEMNS3NzrnSKREGfPF44,1775
-wagtail-6.2.2.dist-info/LICENSE,sha256=0aiL7_RJ2YkOjscmRI7opwmuURrY6h8MR0B24nrdRQU,1512
-wagtail-6.2.2.dist-info/METADATA,sha256=rxTJqLOnZ1WkAQT_XmD5z2xIu2Hvuk-B6FCQM3uc4V4,3758
-wagtail-6.2.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wagtail-6.2.2.dist-info/entry_points.txt,sha256=R14Z0xKoufNcDaku0EWDKM-K8J4ap0EImO8C-df8HVM,53
-wagtail-6.2.2.dist-info/top_level.txt,sha256=zcKgvuRTi0gSgVzJ1qMoERCwhQ_i0n9bkyxza3oh9as,8
-wagtail-6.2.2.dist-info/RECORD,,
+wagtail-6.2.3.dist-info/LICENSE,sha256=0aiL7_RJ2YkOjscmRI7opwmuURrY6h8MR0B24nrdRQU,1512
+wagtail-6.2.3.dist-info/METADATA,sha256=oR_DNSZgg38xmVK-4rh6DOtUt-FylIUSWKjwDNSM48g,3694
+wagtail-6.2.3.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+wagtail-6.2.3.dist-info/entry_points.txt,sha256=R14Z0xKoufNcDaku0EWDKM-K8J4ap0EImO8C-df8HVM,53
+wagtail-6.2.3.dist-info/top_level.txt,sha256=zcKgvuRTi0gSgVzJ1qMoERCwhQ_i0n9bkyxza3oh9as,8
+wagtail-6.2.3.dist-info/RECORD,,