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

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-08-07 10:06+0100\n"
+"POT-Creation-Date: 2024-10-21 17:53+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/"
@@ -127,15 +127,6 @@ msgstr "刪除群組將會從所有群組成員移除群權限"
 msgid "Are you sure you want to delete this group?"
 msgstr "確定要刪除該群組？"
 
-msgid "Add group"
-msgstr "新增群群組"
-
-msgid "Save"
-msgstr "儲存"
-
-msgid "Delete group"
-msgstr "刪除群組"
-
 msgid "Object permissions"
 msgstr "對象權限"
 
@@ -148,15 +139,6 @@ msgstr "新增"
 msgid "Change"
 msgstr "更改"
 
-msgid "Publish"
-msgstr "發佈"
-
-msgid "Lock"
-msgstr "鎖定"
-
-msgid "Unlock"
-msgstr "解鎖"
-
 msgid "Other permissions"
 msgstr "其他權限"
 
@@ -189,12 +171,6 @@ msgstr "帳號"
 msgid "Roles"
 msgstr "角色"
 
-msgid "Add user"
-msgstr "新增使用者"
-
-msgid "Delete user"
-msgstr "刪除使用者"
-
 msgid "Active"
 msgstr "有效"
 
@@ -210,6 +186,9 @@ msgstr "新增一個群組"
 msgid "Search groups"
 msgstr "搜索群組"
 
+msgid "Add group"
+msgstr "新增群群組"
+
 #, python-format
 msgid "Group '%(object)s' created."
 msgstr "群組 '%(object)s' 已創建"
@@ -228,6 +207,9 @@ msgstr "檢視群組中的使用者"
 msgid "Group '%(object)s' deleted."
 msgstr "群組 '%(object)s' 已刪除。"
 
+msgid "Delete group"
+msgstr "刪除群組"
+
 msgid "Add a user"
 msgstr "新增使用者"
 
@@ -243,6 +225,9 @@ msgstr "管理"
 msgid "Status"
 msgstr "狀態"
 
+msgid "Add user"
+msgstr "新增使用者"
+
 #, python-format
 msgid "User '%(object)s' updated."
 msgstr "使用者 '%(object)s' 已更新。"
@@ -250,6 +235,9 @@ msgstr "使用者 '%(object)s' 已更新。"
 msgid "The user could not be saved due to errors."
 msgstr "無法儲存使用者。出現錯誤。"
 
+msgid "Delete user"
+msgstr "刪除使用者"
+
 #, python-format
 msgid "User '%(object)s' deleted."
 msgstr "使用者 '%(object)s' 已刪除。"

wagtail/users/migrations/0014_userprofile_contrast.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.6 on 2024-09-23 15:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("wagtailusers", "0013_userprofile_density"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="userprofile",
+            name="contrast",
+            field=models.CharField(
+                choices=[("system", "System default"), ("more_contrast", "More contrast")],
+                default="system",
+                max_length=40,
+                verbose_name="contrast",
+            ),
+        ),
+    ]

wagtail/users/models.py

@@ -84,6 +84,17 @@ class UserProfile(models.Model):
         max_length=40,
     )
 
+    class AdminContrastThemes(models.TextChoices):
+        SYSTEM = "system", _("System default")
+        MORE_CONTRAST = "more_contrast", _("More contrast")
+
+    contrast = models.CharField(
+        verbose_name=_("contrast"),
+        choices=AdminContrastThemes.choices,
+        default=AdminContrastThemes.SYSTEM,
+        max_length=40,
+    )
+
     class AdminDensityThemes(models.TextChoices):
         DEFAULT = "default", _("Default")
         SNUG = "snug", _("Snug")

wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_assign_role.html

@@ -1,7 +1,11 @@
 {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %}
 {% load i18n wagtailusers_tags wagtailadmin_tags %}
 
-{% block titletag %}{% blocktrans trimmed count counter=items|length %}Assign role to 1 user {% plural %}Assign role to {{ counter }} users{% endblocktrans %}{% endblock %}
+{% block titletag %}
+    {% with counter_val=items|length %}
+        {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}Assign role to 1 user {% plural %}Assign role to {{ counter }} users{% endblocktrans %}
+    {% endwith %}
+{% endblock %}
 
 {% block header %}
     {% trans "Assign role" as header_str %}

wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html

@@ -1,7 +1,11 @@
 {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %}
 {% load i18n wagtailusers_tags wagtailadmin_tags %}
 
-{% block titletag %}{% blocktrans trimmed count counter=items|length %}Delete 1 user {% plural %}Delete {{ counter }} users{% endblocktrans %}{% endblock %}
+{% block titletag %}
+    {% with counter_val=items|length %}
+        {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}Delete 1 user {% plural %}Delete {{ counter }} users{% endblocktrans %}
+    {% endwith %}
+{% endblock %}
 
 {% block header %}
     {% trans "Delete" as del_str %}

wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_set_active_state.html

@@ -1,7 +1,11 @@
 {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %}
 {% load i18n wagtailusers_tags wagtailadmin_tags %}
 
-{% block titletag %}{% blocktrans trimmed count counter=items|length %}Change active state for 1 user {% plural %}Change active state for {{ counter }} users{% endblocktrans %}{% endblock %}
+{% block titletag %}
+    {% with counter_val=items|length %}
+        {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}Change active state for 1 user {% plural %}Change active state for {{ counter }} users{% endblocktrans %}
+    {% endwith %}
+{% endblock %}
 
 {% block header %}
     {% trans "Set active state" as header_str %}

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

@@ -1,26 +1,28 @@
 {% extends "wagtailadmin/generic/create.html" %}
 {% load wagtailusers_tags i18n wagtailadmin_tags %}
 
-{% block main_content %}
-    <form action="{% url 'wagtailusers_groups:add' %}" method="POST" novalidate>
-        {% csrf_token %}
+{% block form_content %}
+    {% block fields %}
+        {% comment %}
+            This block is not documented, but developers might assume its existence
+            based on the docs for custom user forms.
+        {% endcomment %}
+
+        {% panel id="name" heading=form.name.label id_for_label=form.name.id_for_label is_required=True %}
+            {% formattedfield field=form.name show_label=False %}
+        {% endpanel %}
+
+        <div class="w-form-width">
+            {# This block is documented in the docs for customizing group views #}
+            {% block extra_fields %}{% endblock extra_fields %}
+
+            {% format_permissions permission_bound_field=form.permissions %}
 
-        <ul class="fields">
-            {% block fields %}
-                <li>{% formattedfield form.name %}</li>
-                {% block extra_fields %}{% endblock extra_fields %}
-            {% endblock fields %}
-            <li>
-                {% format_permissions permission_bound_field=form.permissions %}
-            </li>
             {% for panel in permission_panels %}
-                <li>
-                    {{ panel.as_admin_panel }}
-                </li>
+                {{ panel.as_admin_panel }}
             {% endfor %}
-            <li><input type="submit" value="{% trans 'Add group' %}" class="button" /></li>
-        </ul>
-    </form>
+        </div>
+    {% endblock %}
 {% endblock %}
 
 {% block extra_js %}

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

@@ -1,40 +1,2 @@
-{% extends "wagtailadmin/generic/edit.html" %}
-{% load wagtailusers_tags wagtailadmin_tags i18n %}
-
-{% block main_content %}
-    <form action="{% url 'wagtailusers_groups:edit' group.id %}" method="POST" novalidate>
-        {% csrf_token %}
-
-        <div class="fields">
-            {% block fields %}
-                {% panel id="name" heading=form.name.label id_for_label=form.name.id_for_label is_required=True %}
-                    {% formattedfield field=form.name show_label=False %}
-                {% endpanel %}
-                {% block extra_fields %}{% endblock extra_fields %}
-            {% endblock fields %}
-
-            <div>
-                {% format_permissions permission_bound_field=form.permissions %}
-            </div>
-
-            {% for panel in permission_panels %}
-                <div>
-                    {{ panel.as_admin_panel }}
-                </div>
-            {% endfor %}
-            <div>
-                <input type="submit" value="{% trans 'Save' %}" class="button" />
-
-                {% if perms.auth.delete_group %}
-                    <a href="{% url 'wagtailusers_groups:delete' group.id %}" class="button no">{% trans "Delete group" %}</a>
-                {% endif %}
-            </div>
-        </div>
-
-    </form>
-{% endblock %}
-
-{% block extra_js %}
-    {{ block.super }}
-    {% include "wagtailusers/groups/includes/group_form_js.html" %}
-{% endblock %}
+{% extends "wagtailusers/groups/create.html" %}
+{# The built-in templates are now identical. #}

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