wagtail 6.0.2__py3-none-any.whl → 6.1rc1__py3-none-any.whl

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

@@ -2,15 +2,7 @@
 {% load wagtailadmin_tags wagtailimages_tags %}
 {% load i18n %}
 
-{% block main_header %}
-    {% include "wagtailadmin/shared/header.html" with title=page_title icon=header_icon merged=1 only %}
-{% endblock %}
-
-{% block content %}
-    {% block header %}
-        {{ block.super }}
-    {% endblock %}
-
+{% block main_content %}
     <div class="w-tabs" data-tabs>
         <div class="w-tabs__wrapper">
             <div role="tablist" class="w-tabs__list">

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

@@ -2,15 +2,7 @@
 {% load wagtailimages_tags wagtailadmin_tags %}
 {% load i18n %}
 
-{% block main_header %}
-    {% include "wagtailadmin/shared/header.html" with title=page_title subtitle=page_subtitle icon=header_icon merged=1 only %}
-{% endblock %}
-
-{% block content %}
-    {% block header %}
-        {{ block.super }}
-    {% endblock %}
-
+{% block main_content %}
     <div class="w-tabs" data-tabs>
         <div class="w-tabs__wrapper">
             <div role="tablist" class="w-tabs__list">

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

@@ -8,10 +8,7 @@
     <script defer src="{% versioned_static 'wagtailadmin/js/bulk-actions.js' %}"></script>
 {% endblock %}
 
-{% block listing %}
-    <div id="listing-results" class="users">
-        {% include "wagtailusers/users/index_results.html" %}
-    </div>
+{% 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=app_label model_name=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 %}
 {% endblock %}

wagtail/users/templates/wagtailusers/users/index_results.html

@@ -1,20 +1,10 @@
 {% extends "wagtailadmin/generic/index_results.html" %}
 {% load i18n wagtailadmin_tags %}
 
-{% block results %}
-    {% include "wagtailusers/users/list.html" %}
-{% endblock %}
-
 {% block no_results_message %}
-    {% if is_searching %}
-        <h2 role="alert">{% blocktrans trimmed %}Sorry, no users match "<em>{{ query_string }}</em>"{% endblocktrans %}</h2>
+    {% if is_searching or is_filtering %}
+        <h2 role="alert">{% blocktrans trimmed %}Sorry, no users match your query{% endblocktrans %}</h2>
     {% else %}
-        {% if group %}
-            {% with group.name as group_name %}
-                <p>{% blocktrans trimmed with wagtailusers_add_url=add_url %}The {{ group_name }} group has no users configured. Why not <a href="{{ wagtailusers_add_url }}">add some</a>?{% endblocktrans %}</p>
-            {% endwith %}
-        {% else %}
-            <p>{% blocktrans trimmed with wagtailusers_add_url=add_url %}There are no users configured. Why not <a href="{{ wagtailusers_add_url }}">add some</a>?{% endblocktrans %}</p>
-        {% endif %}
+        <p>{% blocktrans trimmed with wagtailusers_add_url=add_url %}There are no users configured. Why not <a href="{{ wagtailusers_add_url }}">add some</a>?{% endblocktrans %}</p>
     {% endif %}
 {% endblock %}

wagtail/users/templates/wagtailusers/users/user_cell.html

@@ -0,0 +1,9 @@
+{% extends "wagtailadmin/tables/title_cell.html" %}
+{% load wagtailadmin_tags %}
+
+{% block title %}
+    <div class="w-flex w-items-center">
+        {% avatar user=instance size="small" classname="w-shrink-0" %}
+        {{ block.super }}
+    </div>
+{% endblock %}

wagtail/users/templatetags/wagtailusers_tags.py

@@ -1,14 +1,60 @@
-import itertools
-import re
+from collections import defaultdict
+from warnings import warn
 
 from django import template
+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 wagtail import hooks
+from wagtail.admin.models import Admin
+from wagtail.coreutils import accepts_kwarg
 from wagtail.users.permission_order import CONTENT_TYPE_ORDER
+from wagtail.utils.deprecation import RemovedInWagtail70Warning
 
 register = template.Library()
 
 
+def normalize_permission_label(permission: Permission):
+    """
+    Strip model name from the end of the label, e.g. "Can deliver pizza" for a
+    Pizza model becomes "Can deliver". For permissions in the model's
+    Meta.default_permissions with default labels, also replace underscores
+    with spaces.
+
+    This is used to display custom model permissions in the admin.
+
+    See https://github.com/wagtail/wagtail/issues/10982.
+    """
+    label = permission.name
+    content_type = permission.content_type
+    model = content_type.model_class()
+    verbose_name = default_verbose_name = content_type.name
+
+    if model:
+        default_verbose_name = camel_case_to_spaces(model._meta.object_name)
+
+        # If it's in default_permissions and the label matches Django's default
+        # label, remove the model name from the end of the label. Also replace
+        # underscores with spaces, as Django uses the action internal name as-is
+        # for the permission label, which means it tends to be in snake_case.
+        for action in model._meta.default_permissions:
+            default_codename = get_permission_codename(action, model._meta)
+            is_default = permission.codename == default_codename
+            if is_default and permission.name.startswith(f"Can {action}"):
+                return f"Can {action.replace('_', ' ')}"
+
+    # For all other cases (including custom permissions), try to remove the
+    # verbose name from the end of the label. This only works if the label
+    # matches the current verbose name or Django's default verbose name.
+    for name in (default_verbose_name, verbose_name):
+        if label.lower().endswith(name.lower()):
+            return label[: -len(name)].strip()
+
+    return label
+
+
 @register.inclusion_tag("wagtailusers/groups/includes/formatted_permissions.html")
 def format_permissions(permission_bound_field):
     """
@@ -55,9 +101,6 @@ def format_permissions(permission_bound_field):
         for checkbox in permission_bound_field
     }
 
-    object_perms = []
-    other_perms = []
-
     # 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"]
@@ -69,38 +112,66 @@ def format_permissions(permission_bound_field):
         "unlock": False,
         "custom": False,
     }
+    # Batch the permission query for all content types, then group by content type
+    # (instead of querying permissions for each content type separately)
+    content_perms_by_ct_id = defaultdict(list)
+    permissions = permissions.filter(content_type_id__in=content_type_ids)
+    for permission in permissions:
+        content_perms_by_ct_id[permission.content_type_id].append(permission)
+
+    # Permissions that use Wagtail's Admin content type, to be displayed
+    # under the "Other permissions" section alongside the
+    # "Can access Wagtail admin" permission.
+    admin_content_type = ContentType.objects.get_for_model(Admin)
+    admin_permissions = content_perms_by_ct_id.pop(admin_content_type.id, [])
+    other_perms = [(perm, checkboxes_by_id[perm.id]) for perm in admin_permissions]
+
+    # We're done with the admin content type, so remove it from the list of content types
+    # but make sure the sorted order is preserved.
+    content_type_ids = [
+        ct_id for ct_id in content_type_ids if ct_id != admin_content_type.pk
+    ]
+
+    # Permissions for all other content types, to be displayed under the
+    # "Object permissions" section.
+    object_perms = []
 
-    for content_type_id in content_type_ids:
-        content_perms = permissions.filter(content_type_id=content_type_id)
+    # Iterate using the sorted content_type_ids
+    for ct_id in content_type_ids:
+        content_perms = content_perms_by_ct_id[ct_id]
         content_perms_dict = {}
         custom_perms = []
 
-        if content_perms[0].content_type.name == "admin":
-            perm = content_perms[0]
-            other_perms.append((perm, checkboxes_by_id[perm.id]))
-            continue
-
         for perm in content_perms:
             content_perms_dict["object"] = perm.content_type.name
             checkbox = checkboxes_by_id[perm.id]
+            attrs = {"data-action": "w-bulk#toggle", "data-w-bulk-target": "item"}
             # identify the main categories of permission, and assign to
             # the relevant dict key, else bung in the 'custom_perms' list
             permission_action = perm.codename.split("_")[0]
-            if permission_action in main_permission_names:
+            is_known = (
+                permission_action in main_permission_names
+                and perm.codename == f"{permission_action}_{perm.content_type.model}"
+            )
+
+            if is_known:
                 if permission_action in extra_perms_exist:
                     extra_perms_exist[permission_action] = True
+                checkbox.data["attrs"].update(attrs)
+                checkbox.data["attrs"]["data-w-bulk-group-param"] = permission_action
                 content_perms_dict[permission_action] = {
                     "perm": perm,
                     "checkbox": checkbox,
                 }
             else:
                 extra_perms_exist["custom"] = True
+                attrs["data-w-bulk-group-param"] = "custom"
+                perm_name = normalize_permission_label(perm)
                 custom_perms.append(
                     {
+                        "attrs": attrs,
                         "perm": perm,
-                        "name": re.sub(
-                            f"{perm.content_type.name}$", "", perm.name, flags=re.I
-                        ).strip(),
+                        "name": perm_name,
                         "selected": checkbox.data["selected"],
                     }
                 )
@@ -116,8 +187,24 @@ def format_permissions(permission_bound_field):
 
 @register.inclusion_tag("wagtailadmin/shared/buttons.html", takes_context=True)
 def user_listing_buttons(context, user):
-    button_hooks = hooks.get_hooks("register_user_listing_buttons")
-    buttons = sorted(
-        itertools.chain.from_iterable(hook(context, user) for hook in button_hooks)
+    warn(
+        "`user_listing_buttons` template tag is deprecated.",
+        category=RemovedInWagtail70Warning,
     )
-    return {"user": user, "buttons": buttons}
+
+    buttons = []
+
+    for hook in hooks.get_hooks("register_user_listing_buttons"):
+        if accepts_kwarg(hook, "request_user"):
+            buttons.extend(hook(user=user, request_user=context.get("request").user))
+        else:
+            # old-style hook that accepts a context argument instead of request_user
+            buttons.extend(hook(context, user))
+            warn(
+                "`register_user_listing_buttons` hook functions should accept a "
+                "`request_user` argument instead of `context` - "
+                f"{hook.__module__}.{hook.__name__} needs to be updated",
+                category=RemovedInWagtail70Warning,
+            )
+
+    return {"user": user, "buttons": sorted(buttons)}