wagtail 5.2.6__py3-none-any.whl → 5.2.7__py3-none-any.whl

wagtail/admin/tests/test_workflows.py

@@ -135,6 +135,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_deactivated(self):
         Workflow.objects.create(name="test_workflow", active=False)
 

wagtail/admin/views/workflows.py

@@ -2,7 +2,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
+from django.db.models import Count
 from django.db.models.functions import Lower
 from django.http import Http404, HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect, render
@@ -34,7 +34,6 @@ from wagtail.models import (
     Task,
     TaskState,
     Workflow,
-    WorkflowContentType,
     WorkflowState,
 )
 from wagtail.permission_policies.pages import PagePermissionPolicy
@@ -64,10 +63,7 @@ class Index(IndexView):
         queryset = super().get_queryset()
         if not self.show_disabled():
             queryset = queryset.filter(active=True)
-        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
 
     def get_context_data(self, **kwargs):

{wagtail-5.2.6.dist-info → wagtail-5.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail
-Version: 5.2.6
+Version: 5.2.7
 Summary: A Django content management system.
 Home-page: https://wagtail.org/
 Author: Wagtail core team + contributors

{wagtail-5.2.6.dist-info → wagtail-5.2.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-wagtail/__init__.py,sha256=XDqUURNn4H7iay8_FXbaL5gYy1CE3-tAmIV_9eF-HW8,724
+wagtail/__init__.py,sha256=4St-DzE6DguGx8VaqXJompPQY0lqdDAZ8M1UzN9jMwM,724
 wagtail/apps.py,sha256=38kXTdHoQzFnpUqDNxFpsqn2dut4V0u9rLOkhqCoYkc,713
 wagtail/compat.py,sha256=L41FhlX4xy5KgTdJ63smtM78mtKf1mxkPeOs8kyOwS0,538
 wagtail/coreutils.py,sha256=ZlmtoHC5YzXmhdKi13QkCSmBryAmS7k8s5jgQjahpEQ,20660
@@ -377,7 +377,7 @@ wagtail/admin/static/wagtailadmin/js/chooser-widget.js,sha256=GG0IH3WKNENdhzTuw-
 wagtail/admin/static/wagtailadmin/js/comments.js,sha256=MKh_wSKkrmK1Qmcntwl1Ita8RGfFpmPhSBPnph1BBLg,52789
 wagtail/admin/static/wagtailadmin/js/core.js,sha256=ug9eXxmla0OUep52JpN8JmcJj4abO2KtpR69lmpSSoQ,74646
 wagtail/admin/static/wagtailadmin/js/date-time-chooser.js,sha256=ErmobEK4AgX6HxunqDbY70Ceduu09-Aayu_6OLEkzEA,3298
-wagtail/admin/static/wagtailadmin/js/draftail.js,sha256=gdcabSoaOtQj7_yU-xH7W5VewCdILz6_4a3rXjgS_OM,293657
+wagtail/admin/static/wagtailadmin/js/draftail.js,sha256=2lxxsF9e56b_X77qy3gk6nF2nHetG8k6J0mpaKoDTfo,293682
 wagtail/admin/static/wagtailadmin/js/draftail.js.LICENSE.txt,sha256=97l5UAKNdHRm-wg_QYro4Ch4ElJtzAVshVlxSIbL9z8,255
 wagtail/admin/static/wagtailadmin/js/expanding-formset.js,sha256=Zk4h1qdpoyKjWpCGz9fuctysx3Tfaggm8dMRPN-1-xI,1594
 wagtail/admin/static/wagtailadmin/js/filtered-select.js,sha256=5nwOxDmWNUys7K6av6vlZ5McIwArzhKlUINFtcKlzzo,2193
@@ -869,7 +869,7 @@ wagtail/admin/tests/test_views.py,sha256=1i8N2Ao6rIbCY9wRXqNQzfSsAojnFxJ1TtI7JYf
 wagtail/admin/tests/test_views_generic.py,sha256=FQJLz9aD7OtToCCwtlYs-Bu_0BxSM99R-jGE4ZPnfAM,2934
 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=f2zd-Baa0ZW3zA-WztgKTAGLkwksUlAQRdA6osnWmdU,145781
+wagtail/admin/tests/test_workflows.py,sha256=452bDYZ3Rw5hp8n-ApaOte14QVnO_hQKkUbzL3s4EwA,146737
 wagtail/admin/tests/tests.py,sha256=GveGPLq49kvtr6J6Qz1-Cv1YHgjPxGk_amOgTeNslaU,22323
 wagtail/admin/tests/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wagtail/admin/tests/api/test_documents.py,sha256=2dfjTi6Bj3otRQ-ok9f3rwl-HpSmprfcmhWyYPDnXcs,5051
@@ -932,7 +932,7 @@ wagtail/admin/views/home.py,sha256=m5uSbOe0GyU12jLGWVFTdTKetIj8aofsSlMwBvIJcZE,1
 wagtail/admin/views/mixins.py,sha256=FCDKcOFItEFogoMr2k9WF6ZFnESwOiR1dfehsWZxyXk,12070
 wagtail/admin/views/page_privacy.py,sha256=VJBPwxyfIgnpVg7dbRfuESLUshTVb-XHmdlHmIZbeeM,2970
 wagtail/admin/views/tags.py,sha256=ZxV-Nzme28b8WaKTk96SFiFOKd_qS2SiQOoaOFUJwjE,812
-wagtail/admin/views/workflows.py,sha256=z_fmIv9fp0wZvMEv1MY--p3eBjFTTWP4Vq4KDnFZMaE,30621
+wagtail/admin/views/workflows.py,sha256=ChQ7CMnGQW_VBHAzU8pAxy7Hr-KLCHNuqZcXC1PooS4,30462
 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=fqADGK-_q2JQ1ErSyYVypvBHS5b-jmVwT1vcHCypEg0,445
@@ -4071,9 +4071,9 @@ wagtail/utils/urlpatterns.py,sha256=RDhVScxdm-RV4HSMjWElyrbEoTPsXu841_SKMgoFKtY,
 wagtail/utils/utils.py,sha256=UALGn0KOyqi5ZoXOozWX99ZPUsVZP51ET8d7sZ1jlm0,430
 wagtail/utils/version.py,sha256=40WGMIy8nSPQJFF01p7c38L444SexH2Cb-bQmR8ztXg,1478
 wagtail/utils/widgets.py,sha256=oTpTMcmQ0Y4MugbSKp_Uigl97ftWdHvMfvhrrLyVmBs,1529
-wagtail-5.2.6.dist-info/LICENSE,sha256=0aiL7_RJ2YkOjscmRI7opwmuURrY6h8MR0B24nrdRQU,1512
-wagtail-5.2.6.dist-info/METADATA,sha256=ggJawfxlL1fllg9awx_FmLH2WB0CPkL4re9iyWet3IU,3850
-wagtail-5.2.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wagtail-5.2.6.dist-info/entry_points.txt,sha256=R14Z0xKoufNcDaku0EWDKM-K8J4ap0EImO8C-df8HVM,53
-wagtail-5.2.6.dist-info/top_level.txt,sha256=zcKgvuRTi0gSgVzJ1qMoERCwhQ_i0n9bkyxza3oh9as,8
-wagtail-5.2.6.dist-info/RECORD,,
+wagtail-5.2.7.dist-info/LICENSE,sha256=0aiL7_RJ2YkOjscmRI7opwmuURrY6h8MR0B24nrdRQU,1512
+wagtail-5.2.7.dist-info/METADATA,sha256=JVYFVFZDxQZBq87QSzO0WuJfJNvTdNre3WKcRANAck0,3850
+wagtail-5.2.7.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+wagtail-5.2.7.dist-info/entry_points.txt,sha256=R14Z0xKoufNcDaku0EWDKM-K8J4ap0EImO8C-df8HVM,53
+wagtail-5.2.7.dist-info/top_level.txt,sha256=zcKgvuRTi0gSgVzJ1qMoERCwhQ_i0n9bkyxza3oh9as,8
+wagtail-5.2.7.dist-info/RECORD,,