wagtail 6.1.2__py3-none-any.whl → 6.2__py3-none-any.whl

wagtail/users/locale/tr/LC_MESSAGES/django.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-02 10:04+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Ragıp Ünal <ragip@ragipunal.com>, 2016\n"
 "Language-Team: Turkish (http://app.transifex.com/torchbox/wagtail/language/"
@@ -179,11 +179,11 @@ msgstr "Üzgünüm, \"%(query)s\" ile eşleşen bir grup bulunamadı"
 
 #, python-format
 msgid ""
-"There are no groups configured. Why not <a href="
-"\"%(wagtailusers_create_group_url)s\">add some</a>?"
+"There are no groups configured. Why not <a "
+"href=\"%(wagtailusers_create_group_url)s\">add some</a>?"
 msgstr ""
-"Herhangi bir grup ayarlanmadı. Neden <a href="
-"\"%(wagtailusers_create_group_url)s\">bir kaç tane ayarlamıyorsunuz</a>?"
+"Herhangi bir grup ayarlanmadı. Neden <a "
+"href=\"%(wagtailusers_create_group_url)s\">bir kaç tane ayarlamıyorsunuz</a>?"
 
 msgid "Are you sure you want to delete this user?"
 msgstr "Bu kullanıcıyı silmek istediğinizden emin misiniz?"

wagtail/users/locale/tr_TR/LC_MESSAGES/django.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-02 10:04+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Ragıp Ünal <ragip@ragipunal.com>, 2015\n"
 "Language-Team: Turkish (Turkey) (http://app.transifex.com/torchbox/wagtail/"
@@ -180,11 +180,11 @@ msgstr "Üzgünüm, \"%(query)s\" ile eşleşen bir grup bulunamadı"
 
 #, python-format
 msgid ""
-"There are no groups configured. Why not <a href="
-"\"%(wagtailusers_create_group_url)s\">add some</a>?"
+"There are no groups configured. Why not <a "
+"href=\"%(wagtailusers_create_group_url)s\">add some</a>?"
 msgstr ""
-"Herhangi bir grup ayarlanmadı. Neden <a href="
-"\"%(wagtailusers_create_group_url)s\">bir kaç tane ayarlamıyorsunuz</a>?"
+"Herhangi bir grup ayarlanmadı. Neden <a "
+"href=\"%(wagtailusers_create_group_url)s\">bir kaç tane ayarlamıyorsunuz</a>?"
 
 msgid "Are you sure you want to delete this user?"
 msgstr "Bu kullanıcıyı silmek istediğinizden emin misiniz?"

wagtail/users/locale/uk/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-02 10:04+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Vladyslav Herasymenko <drimacus182@gmail.com>, 2020,2023\n"
 "Language-Team: Ukrainian (http://app.transifex.com/torchbox/wagtail/language/"
@@ -250,11 +250,11 @@ msgstr "Вибачте, жодна група не збігається з \"%(q
 
 #, python-format
 msgid ""
-"There are no groups configured. Why not <a href="
-"\"%(wagtailusers_create_group_url)s\">add some</a>?"
+"There are no groups configured. Why not <a "
+"href=\"%(wagtailusers_create_group_url)s\">add some</a>?"
 msgstr ""
-"Немає налаштованих груп. Чому б не <a href="
-"\"%(wagtailusers_create_group_url)s\">додати одну</a>?"
+"Немає налаштованих груп. Чому б не <a "
+"href=\"%(wagtailusers_create_group_url)s\">додати одну</a>?"
 
 msgid "Are you sure you want to delete this user?"
 msgstr "Ви впевнені, що хочете видалити цього користувача?"
@@ -276,11 +276,11 @@ msgstr "Обрати всіх користувачів у списку"
 
 #, python-format
 msgid ""
-"There are no users configured. Why not <a href=\"%(wagtailusers_add_url)s"
-"\">add some</a>?"
+"There are no users configured. Why not <a "
+"href=\"%(wagtailusers_add_url)s\">add some</a>?"
 msgstr ""
-"Немає сконфігурованих користувачів. Чому б не <a href="
-"\"%(wagtailusers_add_url)s\">додати одного</a>?"
+"Немає сконфігурованих користувачів. Чому б не <a "
+"href=\"%(wagtailusers_add_url)s\">додати одного</a>?"
 
 #, python-format
 msgid "user %(id)s (deleted)"

wagtail/users/locale/vi/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-02 10:04+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: stdpi, 2024\n"
 "Language-Team: Vietnamese (http://app.transifex.com/torchbox/wagtail/"

wagtail/users/locale/zh/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-02 10:04+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/users/locale/zh_Hans/LC_MESSAGES/django.po

@@ -17,6 +17,7 @@
 # Vincent Zhao <zhaopu2008@gmail.com>, 2017
 # yi huang <yi.codeplayer@gmail.com>, 2018
 # Yin Guanhao <sopium@mysterious.site>, 2021
+# Yu Cheng, 2024
 # 祝沙军 <zhushajun@gmail.com>, 2017
 # 汇民 王 <whuim@qq.com>, 2017,2019-2021
 # 祝沙军 <zhushajun@gmail.com>, 2016
@@ -25,9 +26,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-02 10:04+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
-"Last-Translator: Ford Guo <agile.guo@gmail.com>, 2023\n"
+"Last-Translator: Yu Cheng, 2024\n"
 "Language-Team: Chinese (China) (http://app.transifex.com/torchbox/wagtail/"
 "language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -122,6 +123,15 @@ msgstr "选择你所在时区"
 msgid "profile picture"
 msgstr "配置图片"
 
+msgid "System default"
+msgstr "系统默认"
+
+msgid "Light"
+msgstr "浅色"
+
+msgid "Dark"
+msgstr "深色"
+
 msgid "Default"
 msgstr "默认"
 
@@ -173,6 +183,11 @@ msgstr "确认删除"
 msgid "No, don't delete"
 msgstr "否，不删除"
 
+#, python-format
+msgid "Change active state for 1 user"
+msgid_plural "Change active state for %(counter)s users"
+msgstr[0] "更改 %(counter)s 个用户的活动状态"
+
 msgid "Set active state"
 msgstr "设置活动状态"
 
@@ -188,6 +203,13 @@ msgstr "是的，更改状态"
 msgid "No, don't change state"
 msgstr "否，不更改状态"
 
+#, python-format
+msgid ""
+"The group '%(group_name)s' has <strong>%(group_user_count)s</strong> member."
+msgid_plural ""
+"The group '%(group_name)s' has <strong>%(group_user_count)s</strong> members."
+msgstr[0] "“%(group_name)s”组有 <strong>%(group_user_count)s</strong> 个成员。"
+
 msgid ""
 "Deleting this group will revoke this group's permissions from all member "
 "users."
@@ -229,6 +251,12 @@ msgstr "解锁"
 msgid "Custom permissions"
 msgstr "定制权限"
 
+msgid "Toggle all"
+msgstr "全部切换"
+
+msgid "Toggle all add permissions"
+msgstr "切换所有添加权限"
+
 msgid "Other permissions"
 msgstr "其他权限"
 
@@ -247,8 +275,8 @@ msgstr "对不起，没有符合“%(query)s”的组"
 
 #, python-format
 msgid ""
-"There are no groups configured. Why not <a href="
-"\"%(wagtailusers_create_group_url)s\">add some</a>?"
+"There are no groups configured. Why not <a "
+"href=\"%(wagtailusers_create_group_url)s\">add some</a>?"
 msgstr ""
 "目前还没有组。<a href=\"%(wagtailusers_create_group_url)s\">添加</a>一个？"
 
@@ -270,10 +298,13 @@ msgstr "删除用户"
 msgid "Select all users in listing"
 msgstr "选择列表中的所有用户"
 
+msgid "Sorry, no users match your query"
+msgstr "抱歉，没有用户符合您的查询"
+
 #, python-format
 msgid ""
-"There are no users configured. Why not <a href=\"%(wagtailusers_add_url)s"
-"\">add some</a>?"
+"There are no users configured. Why not <a "
+"href=\"%(wagtailusers_add_url)s\">add some</a>?"
 msgstr ""
 "目前还没有用户。为何不<a href=\"%(wagtailusers_add_url)s\">添加一些用户</a>？"
 
@@ -303,6 +334,9 @@ msgstr "有效"
 msgid "Inactive"
 msgstr "无效"
 
+msgid "Mark as active"
+msgstr "标记为活动状态"
+
 msgid "Change the active state for selected users"
 msgstr "更改所选用户的活动状态"
 
@@ -343,6 +377,9 @@ msgstr "查看此组中的用户"
 msgid "Group '%(object)s' deleted."
 msgstr "组 '%(object)s' 已删除。"
 
+msgid "Last login"
+msgstr "上次登录"
+
 msgid "Group"
 msgstr "组"
 
@@ -358,9 +395,16 @@ msgstr "用户名"
 msgid "Admin"
 msgstr "管理"
 
+msgid "Access level"
+msgstr "访问权限"
+
 msgid "Status"
 msgstr "状态"
 
+#, python-format
+msgid "More options for '%(title)s'"
+msgstr "“%(title)s”的更多选项"
+
 #, python-format
 msgid "User '%(object)s' created."
 msgstr "用户 '%(object)s' 已创建."

wagtail/users/locale/zh_Hant/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-02 10:04+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Yeh Yen-Ke <yyken@outlook.com>, 2019\n"
 "Language-Team: Chinese Traditional (http://app.transifex.com/torchbox/"
@@ -175,8 +175,8 @@ msgstr "對不起，沒有符合“%(query)s”的群組"
 
 #, python-format
 msgid ""
-"There are no groups configured. Why not <a href="
-"\"%(wagtailusers_create_group_url)s\">add some</a>?"
+"There are no groups configured. Why not <a "
+"href=\"%(wagtailusers_create_group_url)s\">add some</a>?"
 msgstr ""
 "目前還沒有群組。<a href=\"%(wagtailusers_create_group_url)s\">新增</a>一個？"
 

wagtail/users/models.py

@@ -89,6 +89,7 @@ class UserProfile(models.Model):
         SNUG = "snug", _("Snug")
 
     density = models.CharField(
+        # Translators: "Density" is the term used to describe the amount of space between elements in the user interface
         verbose_name=_("density"),
         choices=AdminDensityThemes.choices,
         default=AdminDensityThemes.DEFAULT,

wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html

@@ -96,7 +96,8 @@
                                     <fieldset class="w-p-0">
                                         <legend class="w-sr-only">{% trans "Custom permissions" %}</legend>
                                         {% for custom_perm in content_perms_dict.custom %}
-                                            {% include "wagtailadmin/shared/forms/single_checkbox.html" with name="permissions" value=custom_perm.perm.id checked=custom_perm.selected text=custom_perm.name attrs=custom_perm.attrs %}
+                                            {% trans custom_perm.name as custom_perm_label %}
+                                            {% include "wagtailadmin/shared/forms/single_checkbox.html" with name="permissions" value=custom_perm.perm.id checked=custom_perm.selected text=custom_perm_label attrs=custom_perm.attrs %}
                                         {% endfor %}
                                     </fieldset>
                                 {% endif %}
@@ -170,7 +171,7 @@
             <tbody>
                 {% for perm_tuple in other_perms %}
                     <tr>
-                        <td class="title"><label for="{{ perm_tuple.1.id_for_label }}" class="w-label-3">{{ perm_tuple.0.name }}</label></td>
+                        <td class="title"><label for="{{ perm_tuple.1.id_for_label }}" class="w-label-3">{% trans perm_tuple.0.name %}</label></td>
                         <td>
                             {{ perm_tuple.1.tag }}
                         </td>

wagtail/users/templatetags/wagtailusers_tags.py

@@ -6,6 +6,7 @@ from django.contrib.auth import get_permission_codename
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.utils.text import camel_case_to_spaces
+from django.utils.translation import gettext_noop
 
 from wagtail import hooks
 from wagtail.admin.models import Admin
@@ -55,6 +56,14 @@ def normalize_permission_label(permission: Permission):
     return label
 
 
+# normalize_permission_label will return "Can view" for Django's standard "Can view X" permission.
+# formatted_permissions.html passes these labels through {% trans %} - since this is a variable
+# within the template it will not be picked up by makemessages, so we define a translation here
+# instead.
+
+VIEW_PERMISSION_LABEL = gettext_noop("Can view")
+
+
 @register.inclusion_tag("wagtailusers/groups/includes/formatted_permissions.html")
 def format_permissions(permission_bound_field):
     """

wagtail/users/tests/__init__.py

@@ -2,6 +2,12 @@ from .test_admin_views import (
     CustomGroupViewSet,
     CustomUserCreationForm,
     CustomUserEditForm,
+    CustomUserViewSet,
 )
 
-__all__ = ["CustomGroupViewSet", "CustomUserCreationForm", "CustomUserEditForm"]
+__all__ = [
+    "CustomGroupViewSet",
+    "CustomUserViewSet",
+    "CustomUserCreationForm",
+    "CustomUserEditForm",
+]

wagtail/users/tests/test_admin_views.py

@@ -33,12 +33,16 @@ from wagtail.models import (
 )
 from wagtail.test.utils import WagtailTestUtils
 from wagtail.test.utils.template_tests import AdminTemplateTestUtils
-from wagtail.users.forms import UserCreationForm, UserEditForm
+from wagtail.users.forms import GroupForm, UserCreationForm, UserEditForm
 from wagtail.users.models import UserProfile
 from wagtail.users.permission_order import register as register_permission_order
 from wagtail.users.views.groups import GroupViewSet
-from wagtail.users.views.users import get_user_creation_form, get_user_edit_form
-from wagtail.users.wagtail_hooks import get_group_viewset_cls
+from wagtail.users.views.users import (
+    UserViewSet,
+    get_user_creation_form,
+    get_user_edit_form,
+)
+from wagtail.users.wagtail_hooks import get_viewset_cls
 from wagtail.users.widgets import UserListingButton
 from wagtail.utils.deprecation import RemovedInWagtail70Warning
 
@@ -53,6 +57,10 @@ def test_avatar_provider(user, default, size=50):
     return "/nonexistent/path/to/avatar.png"
 
 
+class CustomGroupForm(GroupForm):
+    pass
+
+
 class CustomUserCreationForm(UserCreationForm):
     country = forms.CharField(required=True, label="Country")
     attachment = forms.FileField(required=True, label="Attachment")
@@ -66,6 +74,18 @@ class CustomUserEditForm(UserEditForm):
 class CustomGroupViewSet(GroupViewSet):
     icon = "custom-icon"
 
+    def get_form_class(self, for_update=False):
+        return CustomGroupForm
+
+
+class CustomUserViewSet(UserViewSet):
+    icon = "custom-icon"
+
+    def get_form_class(self, for_update=False):
+        if for_update:
+            return CustomUserEditForm
+        return CustomUserCreationForm
+
 
 class TestUserFormHelpers(TestCase):
     def test_get_user_edit_form_with_default_form(self):
@@ -80,25 +100,45 @@ class TestUserFormHelpers(TestCase):
         WAGTAIL_USER_CREATION_FORM="wagtail.users.tests.CustomUserCreationForm"
     )
     def test_get_user_creation_form_with_custom_form(self):
-        user_form = get_user_creation_form()
+        with self.assertWarnsMessage(
+            RemovedInWagtail70Warning,
+            "The `WAGTAIL_USER_CREATION_FORM` setting is deprecated. Use a custom "
+            "`UserViewSet` subclass and override `get_form_class()` instead.",
+        ):
+            user_form = get_user_creation_form()
         self.assertIs(user_form, CustomUserCreationForm)
 
     @override_settings(WAGTAIL_USER_EDIT_FORM="wagtail.users.tests.CustomUserEditForm")
     def test_get_user_edit_form_with_custom_form(self):
-        user_form = get_user_edit_form()
+        with self.assertWarnsMessage(
+            RemovedInWagtail70Warning,
+            "The `WAGTAIL_USER_EDIT_FORM` setting is deprecated. Use a custom "
+            "`UserViewSet` subclass and override `get_form_class()` instead.",
+        ):
+            user_form = get_user_edit_form()
         self.assertIs(user_form, CustomUserEditForm)
 
     @override_settings(
         WAGTAIL_USER_CREATION_FORM="wagtail.users.tests.CustomUserCreationFormDoesNotExist"
     )
     def test_get_user_creation_form_with_invalid_form(self):
-        self.assertRaises(ImproperlyConfigured, get_user_creation_form)
+        with self.assertWarnsMessage(
+            RemovedInWagtail70Warning,
+            "The `WAGTAIL_USER_CREATION_FORM` setting is deprecated. Use a custom "
+            "`UserViewSet` subclass and override `get_form_class()` instead.",
+        ):
+            self.assertRaises(ImproperlyConfigured, get_user_creation_form)
 
     @override_settings(
         WAGTAIL_USER_EDIT_FORM="wagtail.users.tests.CustomUserEditFormDoesNotExist"
     )
     def test_get_user_edit_form_with_invalid_form(self):
-        self.assertRaises(ImproperlyConfigured, get_user_edit_form)
+        with self.assertWarnsMessage(
+            RemovedInWagtail70Warning,
+            "The `WAGTAIL_USER_EDIT_FORM` setting is deprecated. Use a custom "
+            "`UserViewSet` subclass and override `get_form_class()` instead.",
+        ):
+            self.assertRaises(ImproperlyConfigured, get_user_edit_form)
 
 
 class TestGroupUsersView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
@@ -466,7 +506,6 @@ class TestUserCreateView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
     )
     @override_settings(
         WAGTAIL_USER_CREATION_FORM="wagtail.users.tests.CustomUserCreationForm",
-        WAGTAIL_USER_CUSTOM_FIELDS=["country", "document"],
     )
     def test_create_with_custom_form(self):
         response = self.post(
@@ -1625,7 +1664,7 @@ class TestGroupIndexView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         self.assertEqual(names, ["Editors", "Moderators", "Photographers"])
 
 
-class TestGroupIndexResultsView(WagtailTestUtils, TestCase):
+class TestGroupIndexResultsView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
     def setUp(self):
         self.login()
 
@@ -1637,7 +1676,7 @@ class TestGroupIndexResultsView(WagtailTestUtils, TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "wagtailadmin/generic/listing_results.html")
         # response should not contain page furniture
-        self.assertNotContains(response, "Add a group")
+        self.assertBreadcrumbsNotRendered(response.content)
 
     def test_search(self):
         response = self.get({"q": "Hello"})
@@ -2397,7 +2436,7 @@ class TestGroupEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
 
     def test_is_custom_permission_checked(self):
         # Add a permission from the 'custom permission' column to the user's group
-        custom_permission = Permission.objects.get(codename="view_fancysnippet")
+        custom_permission = Permission.objects.get(codename="view_fullfeaturedsnippet")
         self.test_group.permissions.add(custom_permission)
 
         response = self.get()
@@ -2566,44 +2605,76 @@ class TestGroupHistoryView(WagtailTestUtils, TestCase):
 
 
 class TestGroupViewSet(TestCase):
+    app_config_attr = "group_viewset"
+    default_viewset_cls = GroupViewSet
+    custom_viewset_cls = CustomGroupViewSet
+    create_form_cls = CustomGroupForm
+    edit_form_cls = CustomGroupForm
+
     def setUp(self):
         self.app_config = apps.get_app_config("wagtailusers")
 
-    def test_get_group_viewset_cls(self):
-        self.assertIs(get_group_viewset_cls(self.app_config), GroupViewSet)
+    def test_get_viewset_cls(self):
+        self.assertIs(
+            get_viewset_cls(self.app_config, self.app_config_attr),
+            self.default_viewset_cls,
+        )
 
-    def test_get_group_viewset_cls_with_custom_form(self):
+    def test_get_viewset_cls_with_custom_form(self):
         with unittest.mock.patch.object(
             self.app_config,
-            "group_viewset",
-            new="wagtail.users.tests.CustomGroupViewSet",
+            self.app_config_attr,
+            new=f"wagtail.users.tests.{self.custom_viewset_cls.__name__}",
         ):
-            group_viewset = get_group_viewset_cls(self.app_config)
-        self.assertIs(group_viewset, CustomGroupViewSet)
+            group_viewset = get_viewset_cls(self.app_config, self.app_config_attr)
+        self.assertIs(group_viewset, self.custom_viewset_cls)
         self.assertEqual(group_viewset.icon, "custom-icon")
+        viewset = group_viewset()
+        self.assertIs(viewset.get_form_class(for_update=False), self.create_form_cls)
+        self.assertIs(viewset.get_form_class(for_update=True), self.edit_form_cls)
 
-    def test_get_group_viewset_cls_custom_form_invalid_value(self):
+    def test_get_viewset_cls_custom_form_invalid_value(self):
         with unittest.mock.patch.object(
-            self.app_config, "group_viewset", new="asdfasdf"
+            self.app_config, self.app_config_attr, new="asdfasdf"
         ):
-            with self.assertRaises(ImproperlyConfigured) as exc_info:
-                get_group_viewset_cls(self.app_config)
-            self.assertIn(
-                "asdfasdf doesn't look like a module path", str(exc_info.exception)
-            )
+            with self.assertRaisesMessage(
+                ImproperlyConfigured,
+                f"Invalid setting for WagtailUsersAppConfig.{self.app_config_attr}: "
+                "asdfasdf doesn't look like a module path",
+            ):
+                get_viewset_cls(self.app_config, self.app_config_attr)
 
-    def test_get_group_viewset_cls_custom_form_does_not_exist(self):
+    def test_get_viewset_cls_custom_form_does_not_exist(self):
         with unittest.mock.patch.object(
             self.app_config,
-            "group_viewset",
+            self.app_config_attr,
             new="wagtail.users.tests.CustomClassDoesNotExist",
         ):
-            with self.assertRaises(ImproperlyConfigured) as exc_info:
-                get_group_viewset_cls(self.app_config)
-            self.assertIn(
+            with self.assertRaisesMessage(
+                ImproperlyConfigured,
+                f"Invalid setting for WagtailUsersAppConfig.{self.app_config_attr}: "
                 'Module "wagtail.users.tests" does not define a "CustomClassDoesNotExist" attribute/class',
-                str(exc_info.exception),
-            )
+            ):
+                get_viewset_cls(self.app_config, self.app_config_attr)
+
+
+class TestUserViewSet(TestGroupViewSet):
+    app_config_attr = "user_viewset"
+    default_viewset_cls = UserViewSet
+    custom_viewset_cls = CustomUserViewSet
+    create_form_cls = CustomUserCreationForm
+    edit_form_cls = CustomUserEditForm
+
+    def test_registered_permissions(self):
+        group_ct = ContentType.objects.get_for_model(Group)
+        qs = Permission.objects.none()
+        for fn in hooks.get_hooks("register_permissions"):
+            qs |= fn()
+        registered_user_permissions = qs.filter(content_type=group_ct)
+        self.assertEqual(
+            set(registered_user_permissions.values_list("codename", flat=True)),
+            {"add_group", "change_group", "delete_group"},
+        )
 
 
 class TestAuthorisationIndexView(WagtailTestUtils, TestCase):
@@ -2957,3 +3028,17 @@ class TestTemplateTags(WagtailTestUtils, TestCase):
             top_level_custom_button.text.strip(),
             "Show profile",
         )
+
+
+class TestAdminPermissions(WagtailTestUtils, TestCase):
+    def test_registered_user_permissions(self):
+        user_ct = ContentType.objects.get_for_model(User)
+        model_name = User._meta.model_name
+        qs = Permission.objects.none()
+        for fn in hooks.get_hooks("register_permissions"):
+            qs |= fn()
+        registered_user_permissions = qs.filter(content_type=user_ct)
+        self.assertEqual(
+            set(registered_user_permissions.values_list("codename", flat=True)),
+            {f"add_{model_name}", f"change_{model_name}", f"delete_{model_name}"},
+        )

wagtail/users/views/groups.py

@@ -149,6 +149,10 @@ class GroupViewSet(ModelViewSet):
     model = Group
     ordering = ["name"]
     add_to_reference_index = False
+    menu_name = "groups"
+    menu_label = _("Groups")
+    menu_order = 601
+    add_to_settings_menu = True
 
     index_view_class = IndexView
     add_view_class = CreateView