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

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

@@ -11,15 +11,6 @@
                 <col width="10%" />
                 <col width="10%" />
                 <col width="10%" />
-                {% if extra_perms_exist.publish %}
-                    <col width="10%" />
-                {% endif %}
-                {% if extra_perms_exist.lock %}
-                    <col width="10%" />
-                {% endif %}
-                {% if extra_perms_exist.unlock %}
-                    <col width="10%" />
-                {% endif %}
                 {% if extra_perms_exist.custom %}
                     <col width="25%" />
                 {% endif %}
@@ -30,15 +21,6 @@
                     <th>{% trans "Add" %}</th>
                     <th>{% trans "Change" %}</th>
                     <th>{% trans "Delete" %}</th>
-                    {% if extra_perms_exist.publish %}
-                        <th>{% trans "Publish" %}</th>
-                    {% endif %}
-                    {% if extra_perms_exist.lock %}
-                        <th>{% trans "Lock" %}</th>
-                    {% endif %}
-                    {% if extra_perms_exist.unlock %}
-                        <th>{% trans "Unlock" %}</th>
-                    {% endif %}
                     {% if extra_perms_exist.custom %}
                         <th>{% trans "Custom permissions" %}</th>
                     {% endif %}
@@ -66,34 +48,10 @@
                                 {{ content_perms_dict.delete.checkbox.tag }}
                             {% endif %}
                         </td>
-                        {% if extra_perms_exist.publish %}
-                            <td>
-                                {% if content_perms_dict.publish %}
-                                    <label for="{{ content_perms_dict.publish.checkbox.id_for_label }}" class="w-sr-only">{{ content_perms_dict.publish.perm.name }}</label>
-                                    {{ content_perms_dict.publish.checkbox.tag }}
-                                {% endif %}
-                            </td>
-                        {% endif %}
-                        {% if extra_perms_exist.lock %}
-                            <td>
-                                {% if content_perms_dict.lock %}
-                                    <label for="{{ content_perms_dict.lock.checkbox.id_for_label }}" class="w-sr-only">{{ content_perms_dict.lock.perm.name }}</label>
-                                    {{ content_perms_dict.lock.checkbox.tag }}
-                                {% endif %}
-                            </td>
-                        {% endif %}
-                        {% if extra_perms_exist.unlock %}
-                            <td>
-                                {% if content_perms_dict.unlock %}
-                                    <label for="{{ content_perms_dict.unlock.checkbox.id_for_label }}" class="w-sr-only">{{ content_perms_dict.unlock.perm.name }}</label>
-                                    {{ content_perms_dict.unlock.checkbox.tag }}
-                                {% endif %}
-                            </td>
-                        {% endif %}
                         {% if extra_perms_exist.custom %}
                             <td>
                                 {% if content_perms_dict.custom %}
-                                    <fieldset class="w-p-0">
+                                    <fieldset class="w-p-0 w-flex w-flex-col w-gap-1">
                                         <legend class="w-sr-only">{% trans "Custom permissions" %}</legend>
                                         {% for custom_perm in content_perms_dict.custom %}
                                             {% trans custom_perm.name as custom_perm_label %}
@@ -124,24 +82,6 @@
                         <label for="toggle-all-delete" class="visuallyhidden">{% trans "Toggle all delete permissions" %}</label>
                         <input id="toggle-all-delete" type="checkbox" data-action="w-bulk#toggleAll" data-w-bulk-target="all" data-w-bulk-group-param="delete">
                     </td>
-                    {% if extra_perms_exist.publish %}
-                        <td>
-                            <label for="toggle-all-publish" class="visuallyhidden">{% trans "Toggle all publish permissions" %}</label>
-                            <input id="toggle-all-publish" type="checkbox" data-action="w-bulk#toggleAll" data-w-bulk-target="all" data-w-bulk-group-param="publish">
-                        </td>
-                    {% endif %}
-                    {% if extra_perms_exist.lock %}
-                        <td>
-                            <label for="toggle-all-lock" class="visuallyhidden">{% trans "Toggle all lock permissions" %}</label>
-                            <input id="toggle-all-lock" type="checkbox" data-action="w-bulk#toggleAll" data-w-bulk-target="all" data-w-bulk-group-param="lock">
-                        </td>
-                    {% endif %}
-                    {% if extra_perms_exist.unlock %}
-                        <td>
-                            <label for="toggle-all-unlock" class="visuallyhidden">{% trans "Toggle all unlock permissions" %}</label>
-                            <input id="toggle-all-unlock" type="checkbox" data-action="w-bulk#toggleAll" data-w-bulk-target="all" data-w-bulk-group-param="unlock">
-                        </td>
-                    {% endif %}
                     {% if extra_perms_exist.custom %}
                         <td>
                             <label for="toggle-all-custom" class="visuallyhidden">{% trans "Toggle all custom permissions" %}</label>
@@ -165,7 +105,6 @@
             <thead>
                 <tr>
                     <th>{% trans "Name" %}</th>
-                    <th></th>
                 </tr>
             </thead>
             <tbody>

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

@@ -25,7 +25,6 @@
                 {% for identifier, short_label, long_label in formset.permission_types %}
                     <th title="{{ long_label }}">{{ short_label }}</th>
                 {% endfor %}
-                <th></th>
             </tr>
         </thead>
         <tbody id="id_{{ formset.prefix }}-FORMS">

wagtail/users/templates/wagtailusers/users/create.html

@@ -2,7 +2,7 @@
 {% load wagtailadmin_tags wagtailimages_tags %}
 {% load i18n %}
 
-{% block main_content %}
+{% block form_content %}
     <div class="w-tabs" data-tabs>
         <div class="w-tabs__wrapper">
             <div role="tablist" class="w-tabs__list">
@@ -13,55 +13,51 @@
             </div>
         </div>
 
-        <form action="{% url 'wagtailusers_users:add' %}" method="POST" novalidate{% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
-            <div class="tab-content">
-                {% csrf_token %}
-                <section
-                    id="tab-account"
-                    class="w-tabs__panel"
-                    role="tabpanel"
-                    hidden
-                    aria-labelledby="tab-label-account"
-                >
-                    <ul class="fields">
-                        {% block fields %}
-                            {% if form.separate_username_field %}
-                                <li>{% formattedfield form.username_field %}</li>
-                            {% endif %}
-                            <li>{% formattedfield form.email %}</li>
-                            <li>{% formattedfield form.first_name %}</li>
-                            <li>{% formattedfield form.last_name %}</li>
-                            {% block extra_fields %}{% endblock extra_fields %}
-                            {% if form.password1 %}
-                                <li>{% formattedfield form.password1 %}</li>
-                            {% endif %}
-                            {% if form.password2 %}
-                                <li>{% formattedfield form.password2 %}</li>
-                            {% endif %}
-                        {% endblock fields %}
+        <div class="tab-content">
+            <section
+                id="tab-account"
+                class="w-tabs__panel"
+                role="tabpanel"
+                hidden
+                aria-labelledby="tab-label-account"
+            >
+                <ul class="fields">
+                    {% block fields %}
+                        {% if form.separate_username_field %}
+                            <li>{% formattedfield form.username_field %}</li>
+                        {% endif %}
+                        <li>{% formattedfield form.email %}</li>
+                        <li>{% formattedfield form.first_name %}</li>
+                        <li>{% formattedfield form.last_name %}</li>
+                        {% block extra_fields %}{% endblock extra_fields %}
+                        {% if form.password1 %}
+                            <li>{% formattedfield form.password1 %}</li>
+                        {% endif %}
+                        {% if form.password2 %}
+                            <li>{% formattedfield form.password2 %}</li>
+                        {% endif %}
+                    {% endblock fields %}
 
-                        <li>
-                            <a href="#tab-roles" data-tab-trigger class="button">
-                                {% trans "Roles" %}
-                                {% icon name="arrow-right" classname="default" %}
-                            </a>
-                        </li>
-                    </ul>
-                </section>
-                <section
-                    id="tab-roles"
-                    class="w-tabs__panel"
-                    role="tabpanel"
-                    hidden
-                    aria-labelledby="tab-label-roles"
-                >
-                    <ul class="fields">
-                        <li>{% formattedfield form.is_superuser %}</li>
-                        <li>{% formattedfield form.groups %}</li>
-                        <li><button class="button">{% trans "Add user" %}</button></li>
-                    </ul>
-                </section>
-            </div>
-        </form>
+                    <li>
+                        <a href="#tab-roles" data-tab-trigger class="button w-flex w-items-center w-w-fit w-mb-8">
+                            {% trans "Roles" %}
+                            {% icon name="arrow-right" classname="default" %}
+                        </a>
+                    </li>
+                </ul>
+            </section>
+            <section
+                id="tab-roles"
+                class="w-tabs__panel"
+                role="tabpanel"
+                hidden
+                aria-labelledby="tab-label-roles"
+            >
+                <ul class="fields">
+                    <li>{% formattedfield form.is_superuser %}</li>
+                    <li>{% formattedfield form.groups %}</li>
+                </ul>
+            </section>
+        </div>
     </div>
 {% endblock %}

wagtail/users/templates/wagtailusers/users/edit.html

@@ -1,8 +1,8 @@
-{% extends "wagtailadmin/generic/form.html" %}
+{% extends "wagtailadmin/generic/edit.html" %}
 {% load wagtailimages_tags wagtailadmin_tags %}
 {% load i18n %}
 
-{% block main_content %}
+{% block form_content %}
     <div class="w-tabs" data-tabs>
         <div class="w-tabs__wrapper">
             <div role="tablist" class="w-tabs__list">
@@ -13,67 +13,50 @@
             </div>
         </div>
 
-        <form action="{% url 'wagtailusers_users:edit' user.pk %}" method="POST" novalidate{% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
-            <div class="tab-content">
-                {% csrf_token %}
-
-                <section
-                    id="tab-account"
-                    class="w-tabs__panel"
-                    role="tabpanel"
-                    hidden
-                    aria-labelledby="tab-label-account"
-                >
-                    <ul class="fields">
-                        {% block fields %}
-                            {% if form.separate_username_field %}
-                                <li>{% formattedfield form.username_field %}</li>
-                            {% endif %}
-                            <li>{% formattedfield form.email %}</li>
-                            <li>{% formattedfield form.first_name %}</li>
-                            <li>{% formattedfield form.last_name %}</li>
-                            {% block extra_fields %}{% endblock extra_fields %}
-                            {% if form.password1 %}
-                                <li>{% formattedfield form.password1 %}</li>
-                            {% endif %}
-                            {% if form.password2 %}
-                                <li>{% formattedfield form.password2 %}</li>
-                            {% endif %}
-                            {% if form.is_active %}
-                                <li>{% formattedfield form.is_active %}</li>
-                            {% endif %}
-
-                        {% endblock fields %}
-                        <li>
-                            <input type="submit" value="{% trans 'Save' %}" class="button"/>
-                            {% if can_delete %}
-                                <a href="{% url 'wagtailusers_users:delete' user.pk %}" class="button no">{% trans "Delete user" %}</a>
-                            {% endif %}
-                        </li>
-                    </ul>
-                </section>
-                <section
-                    id="tab-roles"
-                    class="w-tabs__panel"
-                    role="tabpanel"
-                    hidden
-                    aria-labelledby="tab-label-roles"
-                >
-                    <ul class="fields">
-                        {% if form.is_superuser %}
-                            <li>{% formattedfield form.is_superuser %}</li>
+        <div class="tab-content">
+            <section
+                id="tab-account"
+                class="w-tabs__panel"
+                role="tabpanel"
+                hidden
+                aria-labelledby="tab-label-account"
+            >
+                <ul class="fields">
+                    {% block fields %}
+                        {% if form.separate_username_field %}
+                            <li>{% formattedfield form.username_field %}</li>
+                        {% endif %}
+                        <li>{% formattedfield form.email %}</li>
+                        <li>{% formattedfield form.first_name %}</li>
+                        <li>{% formattedfield form.last_name %}</li>
+                        {% block extra_fields %}{% endblock extra_fields %}
+                        {% if form.password1 %}
+                            <li>{% formattedfield form.password1 %}</li>
+                        {% endif %}
+                        {% if form.password2 %}
+                            <li>{% formattedfield form.password2 %}</li>
+                        {% endif %}
+                        {% if form.is_active %}
+                            <li>{% formattedfield form.is_active %}</li>
                         {% endif %}
 
-                        <li>{% formattedfield form.groups %}</li>
-                        <li>
-                            <input type="submit" value="{% trans 'Save' %}" class="button"/>
-                            {% if can_delete %}
-                                <a href="{% url 'wagtailusers_users:delete' user.pk %}" class="button no">{% trans "Delete user" %}</a>
-                            {% endif %}
-                        </li>
-                    </ul>
-                </section>
-            </div>
-        </form>
+                    {% endblock fields %}
+                </ul>
+            </section>
+            <section
+                id="tab-roles"
+                class="w-tabs__panel"
+                role="tabpanel"
+                hidden
+                aria-labelledby="tab-label-roles"
+            >
+                <ul class="fields">
+                    {% if form.is_superuser %}
+                        <li>{% formattedfield form.is_superuser %}</li>
+                    {% endif %}
+                    <li>{% formattedfield form.groups %}</li>
+                </ul>
+            </section>
+        </div>
     </div>
 {% endblock %}

wagtail/users/templates/wagtailusers/users/index.html

@@ -2,13 +2,10 @@
 {% load i18n wagtailadmin_tags %}
 {% block extra_js %}
     {{ block.super }}
-    <script>
-        window.wagtailConfig.BULK_ACTION_ITEM_TYPE = 'USER';
-    </script>
     <script defer src="{% versioned_static 'wagtailadmin/js/bulk-actions.js' %}"></script>
 {% endblock %}
 
 {% block bulk_actions %}
     {% trans "Select all users in listing" as select_all_text %}
-    {% include 'wagtailadmin/bulk_actions/footer.html' with select_all_obj_text=select_all_text app_label=model_opts.app_label model_name=model_opts.model_name objects=page_obj %}
+    {% include 'wagtailadmin/bulk_actions/footer.html' with select_all_obj_text=select_all_text app_label=model_opts.app_label model_name=model_opts.model_name objects=page_obj item_type="USER" %}
 {% endblock %}

wagtail/users/templatetags/wagtailusers_tags.py

@@ -76,7 +76,6 @@ def format_permissions(permission_bound_field):
             'add': checkbox,
             'change': checkbox,
             'delete': checkbox,
-            'publish': checkbox,  # only if the model extends DraftStateMixin
             'custom': list_of_checkboxes_for_custom_permissions
         },
     ]
@@ -112,13 +111,10 @@ def format_permissions(permission_bound_field):
 
     # Permissions that are known by Wagtail, to be shown under their own columns.
     # Other permissions will be shown under the "custom permissions" column.
-    main_permission_names = ["add", "change", "delete", "publish", "lock", "unlock"]
+    main_permission_names = ["add", "change", "delete"]
 
     # Only show the columns for these permissions if any of the model has them.
     extra_perms_exist = {
-        "publish": False,
-        "lock": False,
-        "unlock": False,
         "custom": False,
     }
     # Batch the permission query for all content types, then group by content type

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