wagtail 6.4.1__py3-none-any.whl → 7.0rc1__py3-none-any.whl

wagtail/admin/templatetags/wagtailadmin_tags.py

@@ -1,8 +1,6 @@
 import datetime
-import json
 import re
 from urllib.parse import urljoin
-from warnings import warn
 
 from django import template
 from django.conf import settings
@@ -37,6 +35,7 @@ from wagtail.admin.staticfiles import versioned_static as versioned_static_func
 from wagtail.admin.ui import sidebar
 from wagtail.admin.utils import (
     get_admin_base_url,
+    get_keyboard_key_labels_from_request,
     get_latest_str,
     get_user_display_name,
     get_valid_next_url_from_request,
@@ -45,22 +44,18 @@ from wagtail.admin.views.bulk_action.registry import bulk_action_registry
 from wagtail.admin.views.pages.utils import get_breadcrumbs_items_for_page
 from wagtail.admin.widgets import Button, ButtonWithDropdown, PageListingButton
 from wagtail.coreutils import (
-    accepts_kwarg,
     camelcase_to_underscore,
-    escape_script,
     get_content_type_label,
     get_locales_display_names,
 )
 from wagtail.coreutils import cautious_slugify as _cautious_slugify
 from wagtail.models import (
-    CollectionViewRestriction,
     Locale,
     Page,
     PageViewRestriction,
 )
 from wagtail.telepath import JSContext
 from wagtail.users.utils import get_gravatar_url
-from wagtail.utils.deprecation import RemovedInWagtail70Warning
 
 register = template.Library()
 
@@ -236,24 +231,14 @@ def classnames(*classes):
     return " ".join([classname.strip() for classname in flattened if classname])
 
 
-@register.simple_tag(takes_context=True)
-def test_collection_is_public(context, collection):
+@register.simple_tag()
+def test_collection_is_public(collection):
     """
     Usage: {% test_collection_is_public collection as is_public %}
-    Sets 'is_public' to True iff there are no collection view restrictions in place
+    Sets 'is_public' to True if there are no collection view restrictions in place
     on this collection.
-    Caches the list of collection view restrictions in the context, to avoid repeated
-    DB queries on repeated calls.
     """
-    if "all_collection_view_restrictions" not in context:
-        context[
-            "all_collection_view_restrictions"
-        ] = CollectionViewRestriction.objects.select_related("collection").values_list(
-            "collection__name", flat=True
-        )
-
-    is_private = collection.name in context["all_collection_view_restrictions"]
-
+    is_private = collection.get_view_restrictions().exists()
     return not is_private
 
 
@@ -304,31 +289,6 @@ def allow_unicode_slugs():
     return getattr(settings, "WAGTAIL_ALLOW_UNICODE_SLUGS", True)
 
 
-class EscapeScriptNode(template.Node):
-    TAG_NAME = "escapescript"
-
-    def __init__(self, nodelist):
-        super().__init__()
-        warn(
-            "The `escapescript` template tag is deprecated - use `template` elements instead.",
-            category=RemovedInWagtail70Warning,
-        )
-        self.nodelist = nodelist
-
-    def render(self, context):
-        out = self.nodelist.render(context)
-        return escape_script(out)
-
-    @classmethod
-    def handle(cls, parser, token):
-        nodelist = parser.parse(("end" + EscapeScriptNode.TAG_NAME,))
-        parser.delete_first_token()
-        return cls(nodelist)
-
-
-register.tag(EscapeScriptNode.TAG_NAME, EscapeScriptNode.handle)
-
-
 # Helpers for Widget.render_with_errors, our extension to the Django widget API that allows widgets to
 # take on the responsibility of rendering their own error messages
 @register.filter
@@ -463,34 +423,12 @@ def page_listing_buttons(context, page, user, next_url=None):
 
     buttons = []
     for hook in button_hooks:
-        if accepts_kwarg(hook, "user"):
-            buttons.extend(hook(page=page, next_url=next_url, user=user))
-        else:
-            # old-style hook that accepts page_perms instead of user
-            warn(
-                "`register_page_listing_buttons` hook functions should accept a `user` argument instead of `page_perms` -"
-                f" {hook.__module__}.{hook.__name__} needs to be updated",
-                category=RemovedInWagtail70Warning,
-            )
-
-            page_perms = page.permissions_for_user(user)
-            buttons.extend(hook(page, page_perms, next_url))
+        buttons.extend(hook(page=page, next_url=next_url, user=user))
 
     buttons.sort()
 
     for hook in hooks.get_hooks("construct_page_listing_buttons"):
-        if accepts_kwarg(hook, "user"):
-            hook(buttons, page=page, user=user, context=context)
-        else:
-            # old-style hook that accepts page_perms instead of user
-            warn(
-                "`construct_page_listing_buttons` hook functions should accept a `user` argument instead of `page_perms` -"
-                f" {hook.__module__}.{hook.__name__} needs to be updated",
-                category=RemovedInWagtail70Warning,
-            )
-
-            page_perms = page.permissions_for_user(user)
-            hook(buttons, page, page_perms, context)
+        hook(buttons, page=page, user=user, context=context)
 
     return {"page": page, "buttons": buttons}
 
@@ -500,25 +438,13 @@ def page_listing_buttons(context, page, user, next_url=None):
 )
 def page_header_buttons(context, page, user, view_name):
     next_url = context["request"].path
-    page_perms = page.permissions_for_user(user)
     button_hooks = hooks.get_hooks("register_page_header_buttons")
 
     buttons = []
     for hook in button_hooks:
-        if accepts_kwarg(hook, "user"):
-            buttons.extend(
-                hook(page=page, user=user, next_url=next_url, view_name=view_name)
-            )
-        else:
-            # old-style hook that accepts page_perms instead of user
-            warn(
-                "`register_page_header_buttons` hook functions should accept a `user` argument instead of `page_perms` -"
-                f" {hook.__module__}.{hook.__name__} needs to be updated",
-                category=RemovedInWagtail70Warning,
-            )
-
-            page_perms = page.permissions_for_user(user)
-            buttons.extend(hook(page, page_perms, next_url))
+        buttons.extend(
+            hook(page=page, user=user, next_url=next_url, view_name=view_name)
+        )
 
     buttons = [b for b in buttons if b.show]
     buttons.sort()
@@ -708,13 +634,17 @@ def admin_theme_classname(context):
     return f"w-theme-{theme_name} w-density-{density_name} w-contrast-{contrast_name}"
 
 
-@register.simple_tag
-def js_translation_strings():
-    warn(
-        "The `js_translation_strings` template tag will be removed in a future release.",
-        category=RemovedInWagtail70Warning,
-    )
-    return mark_safe(json.dumps(get_js_translation_strings()))
+@register.simple_tag(takes_context=True)
+def admin_theme_color_scheme(context):
+    """
+    Retrieves the color-scheme of the active theme for current user.
+    """
+    user = context["request"].user
+    profile = getattr(user, "wagtail_userprofile", None)
+    theme_name = profile.theme if profile else "system"
+    if theme_name == "system":
+        return "dark light"
+    return theme_name
 
 
 @register.simple_tag
@@ -888,26 +818,6 @@ def i18n_enabled():
     return getattr(settings, "WAGTAIL_I18N_ENABLED", False)
 
 
-@register.simple_tag
-def locales(serialize=True):
-    result = [
-        {
-            "code": locale.language_code,
-            "display_name": force_str(locale.get_display_name()),
-        }
-        for locale in Locale.objects.all()
-    ]
-
-    if serialize:
-        warn(
-            "The `locales` template tag will be removed in a future release.",
-            category=RemovedInWagtail70Warning,
-        )
-        return json.dumps(result)
-
-    return result
-
-
 @register.simple_tag
 def locale_label_from_id(locale_id):
     """
@@ -986,7 +896,13 @@ def wagtail_config(context):
             "BLOCK_PREVIEW": reverse("wagtailadmin_block_preview"),
         },
         "I18N_ENABLED": i18n_enabled(),
-        "LOCALES": locales(serialize=False),
+        "LOCALES": [
+            {
+                "code": locale.language_code,
+                "display_name": force_str(locale.get_display_name()),
+            }
+            for locale in Locale.objects.all()
+        ],
         "STRINGS": get_js_translation_strings(),
     }
 
@@ -1269,9 +1185,9 @@ def formattedfield(
 
     if field:
         context["rendered_field"] = rendered_field or render_with_errors(field)
-        context[
-            "field_classname"
-        ] = f"w-field--{ fieldtype(field) } w-field--{ widgettype(field) }"
+        context["field_classname"] = (
+            f"w-field--{fieldtype(field)} w-field--{widgettype(field)}"
+        )
 
         errors = field.errors
         has_errors = bool(errors)
@@ -1367,43 +1283,52 @@ def keyboard_shortcuts_dialog(context):
     Note: Shortcut keys are intentionally not translated.
     """
 
+    comments_enabled = get_comments_enabled()
     user_agent = context["request"].headers.get("User-Agent", "")
     is_mac = re.search(r"Mac|iPod|iPhone|iPad", user_agent)
-    modifier = "⌘" if is_mac else "Ctrl"
+    KEYS = get_keyboard_key_labels_from_request(context["request"])
 
     return {
         "shortcuts": {
             ("actions-common", _("Common actions")): [
-                (_("Copy"), f"{modifier} + c"),
-                (_("Cut"), f"{modifier} + x"),
-                (_("Paste"), f"{modifier} + v"),
+                (_("Copy"), f"{KEYS.MOD} + c"),
+                (_("Cut"), f"{KEYS.MOD} + x"),
+                (_("Paste"), f"{KEYS.MOD} + v"),
                 (
                     _("Paste and match style")
                     if is_mac
                     else _("Paste without formatting"),
-                    f"{modifier} + Shift + v",
+                    f"{KEYS.MOD} + {KEYS.SHIFT} + v",
                 ),
-                (_("Undo"), f"{modifier} + z"),
+                (_("Undo"), f"{KEYS.MOD} + z"),
                 (
                     _("Redo"),
-                    f"{modifier} + Shift + z" if is_mac else f"{modifier} + y",
+                    f"{KEYS.MOD} + {KEYS.SHIFT} + z" if is_mac else f"{KEYS.MOD} + y",
                 ),
             ],
             ("actions-model", _("Actions")): [
-                (_("Save changes"), f"{modifier} + s"),
-                (_("Preview"), f"{modifier} + p"),
+                (_("Save changes"), f"{KEYS.MOD} + s"),
+                (_("Preview"), f"{KEYS.MOD} + p"),
+                (
+                    _("Add or show comments"),
+                    f"{KEYS.CTRL} + {KEYS.ALT} + m",
+                ),
+            ]
+            if comments_enabled
+            else [
+                (_("Save changes"), f"{KEYS.MOD} + s"),
+                (_("Preview"), f"{KEYS.MOD} + p"),
             ],
             ("rich-text-content", _("Text content")): [
-                (_("Insert or edit a link"), f"{modifier} + k")
+                (_("Insert or edit a link"), f"{KEYS.MOD} + k")
             ],
             ("rich-text-formatting", _("Text formatting")): [
-                (_("Bold"), f"{modifier} + b"),
-                (_("Italic"), f"{modifier} + i"),
-                (_("Underline"), f"{modifier} + u"),
-                (_("Monospace (code)"), f"{modifier} + j"),
-                (_("Strike-through"), f"{modifier} + x"),
-                (_("Superscript"), f"{modifier} + ."),
-                (_("Subscript"), f"{modifier} + ,"),
+                (_("Italic"), f"{KEYS.MOD} + i"),
+                (_("Underline"), f"{KEYS.MOD} + u"),
+                (_("Monospace (code)"), f"{KEYS.MOD} + j"),
+                (_("Strike-through"), f"{KEYS.MOD} + x"),
+                (_("Superscript"), f"{KEYS.MOD} + ."),
+                (_("Subscript"), f"{KEYS.MOD} + ,"),
             ],
         }
     }

wagtail/admin/tests/pages/test_bulk_actions/test_bulk_move.py

@@ -319,3 +319,34 @@ class TestBulkMove(WagtailTestUtils, TestCase):
             Page.objects.get(id=self.test_page_b_1.id).get_parent().id,
             self.section_b.id,
         )
+
+    def test_bulk_move_with_restricted_parent_page_types(self):
+        board_meetings = Page.objects.get(
+            url_path="/home/events/businessy-events/board-meetings/"
+        )
+        url = (
+            reverse(
+                "wagtail_bulk_action",
+                args=(
+                    "wagtailcore",
+                    "page",
+                    "move",
+                ),
+            )
+            + f"?id={board_meetings.id}"
+        )
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+        html = response.content.decode()
+
+        self.assertInHTML("<p>Are you sure you want to move these pages?</p>", html)
+
+        self.assertInHTML(
+            '<li><a href="{edit_page_url}" target="_blank" rel="noreferrer">Board meetings</a></li>'.format(
+                edit_page_url=reverse(
+                    "wagtailadmin_pages:edit", args=[board_meetings.id]
+                ),
+            ),
+            html,
+        )