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

wagtail/users/tests/test_admin_views.py

@@ -27,8 +27,10 @@ from wagtail.coreutils import get_dummy_request
 from wagtail.log_actions import log
 from wagtail.models import (
     Collection,
+    DraftStateMixin,
     GroupCollectionPermission,
     GroupPagePermission,
+    LockableMixin,
     Page,
 )
 from wagtail.test.utils import WagtailTestUtils
@@ -205,7 +207,7 @@ class TestUserIndexView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         # response should contain page furniture, including the "Add a user" button
         self.assertContains(response, "Add a user")
         self.assertBreadcrumbsItemsRendered(
-            [{"url": "", "label": capfirst(User._meta.verbose_name_plural)}],
+            [{"url": "", "label": "Users"}],
             response.content,
         )
 
@@ -244,12 +246,10 @@ class TestUserIndexView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         self.assertIn(self.test_user, results)
 
     def test_pagination(self):
-        # page numbers in range should be accepted
-        response = self.get({"p": 1})
-        self.assertEqual(response.status_code, 200)
-        # page numbers out of range should return 404
-        response = self.get({"p": 9999})
-        self.assertEqual(response.status_code, 404)
+        pages = ["0", "1", "-1", "9999", "Not a page"]
+        for page in pages:
+            response = self.get({"p": page})
+            self.assertEqual(response.status_code, 200)
 
     def test_ordering(self):
         # checking that only valid ordering used, in case of `IndexView` the valid
@@ -1854,7 +1854,6 @@ class TestGroupCreateView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
             Q(codename__startswith="add")
             | Q(codename__startswith="change")
             | Q(codename__startswith="delete")
-            | Q(codename__startswith="publish")
         ).delete()
 
         # A custom permission that happens to also start with "change"
@@ -1873,36 +1872,46 @@ class TestGroupCreateView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
 
         self.assertInHTML("Custom permissions", response.content.decode())
 
-    def test_show_publish_permissions(self):
-        response = self.get()
-        html = response.content.decode()
-
-        # Should show the Publish column
-        self.assertInHTML("<th>Publish</th>", html)
-
-        # Should show inputs for publish permissions on models with DraftStateMixin
-        self.assertInHTML("Can publish draft state model", html)
-        self.assertInHTML("Can publish draft state custom primary key model", html)
-
-        # Should not show inputs for publish permissions on models without DraftStateMixin
-        self.assertNotInHTML("Can publish advert", html)
-
-    def test_hide_publish_permissions(self):
-        # Remove all `publish` permissions
-        Permission.objects.filter(codename__startswith="publish").delete()
-
+    def test_show_mixin_permissions(self):
         response = self.get()
-        html = response.content.decode()
-
-        # Should not show the Publish column
-        self.assertNotInHTML("<th>Publish</th>", html)
-
-        # Should not show inputs for publish permissions even on models with DraftStateMixin
-        self.assertNotInHTML("Can publish draft state model", html)
-        self.assertNotInHTML("Can publish draft state custom primary key model", html)
-
-        # Should not show inputs for publish permissions on models without DraftStateMixin
-        self.assertNotInHTML("Can publish advert", html)
+        soup = self.get_soup(response.content)
+        object_permissions = soup.select_one("#object-permissions-section")
+        self.assertIsNotNone(object_permissions)
+
+        # Should not show separate Publish, Lock, or Unlock columns
+        # (i.e. the checkboxes should be in the "Custom permissions" column)
+        self.assertFalse(
+            {th.text.strip() for th in object_permissions.select("th")}
+            & {"Publish", "Lock", "Unlock"}
+        )
+
+        mixin_permissions = (
+            ("publish", DraftStateMixin),
+            ("lock", LockableMixin),
+            ("unlock", LockableMixin),
+        )
+        for action, mixin in mixin_permissions:
+            with self.subTest(action=action):
+                permissions = Permission.objects.filter(
+                    codename__startswith=action,
+                    content_type__app_label="tests",
+                ).select_related("content_type")
+                self.assertGreater(len(permissions), 0)
+
+                for permission in permissions:
+                    # Should show a checkbox for each permission in the
+                    # "Custom permissions" column (thus inside a fieldset), with a
+                    # simple "Can {action}" label (without the model name)
+                    checkbox = object_permissions.select_one(
+                        f'td > fieldset input[value="{permission.pk}"]'
+                    )
+                    self.assertIsNotNone(checkbox)
+                    label = checkbox.parent
+                    self.assertEqual(label.name, "label")
+                    self.assertEqual(label.text.strip(), f"Can {action}")
+                    # Should only show the permission for models with the mixin applied
+                    content_type = permission.content_type
+                    self.assertTrue(issubclass(content_type.model_class(), mixin))
 
     def test_strip_model_name_from_custom_permissions(self):
         """
@@ -2462,36 +2471,46 @@ class TestGroupEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
 
         self.assertEqual(len(checkbox), 1)
 
-    def test_show_publish_permissions(self):
+    def test_show_mixin_permissions(self):
         response = self.get()
-        html = response.content.decode()
-
-        # Should show the Publish column
-        self.assertInHTML("<th>Publish</th>", html)
-
-        # Should show inputs for publish permissions on models with DraftStateMixin
-        self.assertInHTML("Can publish draft state model", html)
-        self.assertInHTML("Can publish draft state custom primary key model", html)
-
-        # Should not show inputs for publish permissions on models without DraftStateMixin
-        self.assertNotInHTML("Can publish advert", html)
-
-    def test_hide_publish_permissions(self):
-        # Remove all `publish` permissions
-        Permission.objects.filter(codename__startswith="publish").delete()
-
-        response = self.get()
-        html = response.content.decode()
-
-        # Should not show the Publish column
-        self.assertNotInHTML("<th>Publish</th>", html)
-
-        # Should not show inputs for publish permissions even on models with DraftStateMixin
-        self.assertNotInHTML("Can publish draft state model", html)
-        self.assertNotInHTML("Can publish draft state custom primary key model", html)
-
-        # Should not show inputs for publish permissions on models without DraftStateMixin
-        self.assertNotInHTML("Can publish advert", html)
+        soup = self.get_soup(response.content)
+        object_permissions = soup.select_one("#object-permissions-section")
+        self.assertIsNotNone(object_permissions)
+
+        # Should not show separate Publish, Lock, or Unlock columns
+        # (i.e. the checkboxes should be in the "Custom permissions" column)
+        self.assertFalse(
+            {th.text.strip() for th in object_permissions.select("th")}
+            & {"Publish", "Lock", "Unlock"}
+        )
+
+        mixin_permissions = (
+            ("publish", DraftStateMixin),
+            ("lock", LockableMixin),
+            ("unlock", LockableMixin),
+        )
+        for action, mixin in mixin_permissions:
+            with self.subTest(action=action):
+                permissions = Permission.objects.filter(
+                    codename__startswith=action,
+                    content_type__app_label="tests",
+                ).select_related("content_type")
+                self.assertGreater(len(permissions), 0)
+
+                for permission in permissions:
+                    # Should show a checkbox for each permission in the
+                    # "Custom permissions" column (thus inside a fieldset), with a
+                    # simple "Can {action}" label (without the model name)
+                    checkbox = object_permissions.select_one(
+                        f'td > fieldset input[value="{permission.pk}"]'
+                    )
+                    self.assertIsNotNone(checkbox)
+                    label = checkbox.parent
+                    self.assertEqual(label.name, "label")
+                    self.assertEqual(label.text.strip(), f"Can {action}")
+                    # Should only show the permission for models with the mixin applied
+                    content_type = permission.content_type
+                    self.assertTrue(issubclass(content_type.model_class(), mixin))
 
     def test_group_edit_loads_with_django_permissions_in_order(self):
         # ensure objects are ordered as registered, followed by the default ordering

wagtail/users/views/groups.py

@@ -113,7 +113,6 @@ class CreateView(PermissionPanelFormsMixin, generic.CreateView):
 class EditView(PermissionPanelFormsMixin, generic.EditView):
     success_message = _("Group '%(object)s' updated.")
     error_message = _("The group could not be saved due to errors.")
-    delete_item_label = _("Delete group")
     context_object_name = "group"
 
     @cached_property
@@ -159,6 +158,10 @@ class GroupViewSet(ModelViewSet):
     edit_view_class = EditView
     delete_view_class = DeleteView
 
+    # Copying requires prepopulating the formsets with copies of the existing
+    # permissions, which is not currently supported.
+    copy_view_enabled = False
+
     template_prefix = "wagtailusers/groups/"
 
     @property

wagtail/users/views/users.py

@@ -149,6 +149,8 @@ class IndexView(generic.IndexView):
     results_template_name = "wagtailusers/users/index_results.html"
     add_item_label = gettext_lazy("Add a user")
     context_object_name = "users"
+    # We don't set search_fields and the model may not be indexed, but we override
+    # search_queryset, so we set is_searchable to True to enable search
     is_searchable = True
     page_title = gettext_lazy("Users")
     show_other_searches = True

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail
-Version: 6.2.2
+Version: 6.3
 Summary: A Django content management system.
 Home-page: https://wagtail.org/
 Author: Wagtail core team + contributors
@@ -17,27 +17,28 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 4.2
 Classifier: Framework :: Django :: 5.0
+Classifier: Framework :: Django :: 5.1
 Classifier: Framework :: Wagtail
 Classifier: Topic :: Internet :: WWW/HTTP :: Site Management
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 License-File: LICENSE
 Requires-Dist: Django (<6.0,>=4.2)
 Requires-Dist: django-modelcluster (<7.0,>=6.2.1)
 Requires-Dist: django-permissionedforms (<1.0,>=0.1)
-Requires-Dist: django-taggit (<5.1,>=5.0)
+Requires-Dist: django-taggit (<6.2,>=5.0)
 Requires-Dist: django-treebeard (<5.0,>=4.5.1)
 Requires-Dist: djangorestframework (<4.0,>=3.15.1)
 Requires-Dist: django-filter (<25,>=23.3)
 Requires-Dist: draftjs-exporter (<6.0,>=2.1.5)
-Requires-Dist: Pillow (<11.0.0,>=9.1.0)
+Requires-Dist: Pillow (<12.0.0,>=9.1.0)
 Requires-Dist: beautifulsoup4 (<4.13,>=4.8)
 Requires-Dist: Willow[heif] (<2,>=1.8.0)
 Requires-Dist: requests (<3.0,>=2.11.1)
@@ -49,14 +50,12 @@ Requires-Dist: laces (<0.2,>=0.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.0) ; extra == 'docs'
+Requires-Dist: Sphinx (>=7.3) ; 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'
 Requires-Dist: Jinja2 (<3.2,>=3.0) ; extra == 'testing'
 Requires-Dist: boto3 (<2,>=1.28) ; extra == 'testing'
 Requires-Dist: freezegun (>=0.3.8) ; extra == 'testing'