wagtail 6.1.3__py3-none-any.whl → 6.2rc1__py3-none-any.whl

wagtail/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-18 17:28+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,35 +30,35 @@ msgstr ""
 msgid "Add Comment"
 msgstr ""
 
-#: blocks/list_block.py:202 blocks/stream_block.py:170
-#: blocks/stream_block.py:200
+#: blocks/list_block.py:208 blocks/stream_block.py:178
+#: blocks/stream_block.py:208
 #, python-format
 msgid "The minimum number of items is %(min_num)d"
 msgstr ""
 
-#: blocks/list_block.py:210 blocks/stream_block.py:180
-#: blocks/stream_block.py:210
+#: blocks/list_block.py:216 blocks/stream_block.py:188
+#: blocks/stream_block.py:218
 #, python-format
 msgid "The maximum number of items is %(max_num)d"
 msgstr ""
 
-#: blocks/list_block.py:422 blocks/stream_block.py:818
+#: blocks/list_block.py:434 blocks/stream_block.py:837
 msgid "Move up"
 msgstr ""
 
-#: blocks/list_block.py:423 blocks/stream_block.py:819
+#: blocks/list_block.py:435 blocks/stream_block.py:838
 msgid "Move down"
 msgstr ""
 
-#: blocks/list_block.py:424 blocks/stream_block.py:820
+#: blocks/list_block.py:436 blocks/stream_block.py:839
 msgid "Duplicate"
 msgstr ""
 
-#: blocks/list_block.py:425 blocks/stream_block.py:821 wagtail_hooks.py:115
+#: blocks/list_block.py:437 blocks/stream_block.py:840 wagtail_hooks.py:115
 msgid "Delete"
 msgstr ""
 
-#: blocks/list_block.py:426 blocks/stream_block.py:822 models/__init__.py:1123
+#: blocks/list_block.py:438 blocks/stream_block.py:841 models/__init__.py:1123
 msgid "Add"
 msgstr ""
 
@@ -71,7 +71,7 @@ msgstr ""
 msgid "This block has no options."
 msgstr ""
 
-#: blocks/stream_block.py:175
+#: blocks/stream_block.py:183
 msgid "This field is required."
 msgstr ""
 
@@ -340,8 +340,8 @@ msgid ""
 "[my-slug]/"
 msgstr ""
 
-#: models/__init__.py:1156 models/__init__.py:3425 models/__init__.py:3475
-#: models/__init__.py:4322 models/audit_log.py:193
+#: models/__init__.py:1156 models/__init__.py:3428 models/__init__.py:3478
+#: models/__init__.py:4325 models/audit_log.py:193
 msgid "content type"
 msgstr ""
 
@@ -386,279 +386,279 @@ msgstr ""
 msgid "latest revision created at"
 msgstr ""
 
-#: models/__init__.py:1462
+#: models/__init__.py:1465
 #, python-format
 msgid ""
 "The slug '%(page_slug)s' is already in use within the parent page at "
 "'%(parent_url_path)s'"
 msgstr ""
 
-#: models/__init__.py:2760 models/__init__.py:3017 models/__init__.py:3317
-#: models/__init__.py:3384
+#: models/__init__.py:2763 models/__init__.py:3020 models/__init__.py:3320
+#: models/__init__.py:3387
 msgid "page"
 msgstr ""
 
-#: models/__init__.py:2761
+#: models/__init__.py:2764
 msgid "pages"
 msgstr ""
 
-#: models/__init__.py:2841 models/__init__.py:3857
+#: models/__init__.py:2844 models/__init__.py:3860
 #: models/reference_index.py:110 models/reference_index.py:120
 msgid "object id"
 msgstr ""
 
-#: models/__init__.py:2843 models/__init__.py:3876
+#: models/__init__.py:2846 models/__init__.py:3879
 msgid "created at"
 msgstr ""
 
-#: models/__init__.py:2846
+#: models/__init__.py:2849
 msgid "user"
 msgstr ""
 
-#: models/__init__.py:2854
+#: models/__init__.py:2857
 msgid "content JSON"
 msgstr ""
 
-#: models/__init__.py:2857
+#: models/__init__.py:2860
 msgid "approved go live at"
 msgstr ""
 
-#: models/__init__.py:2980 models/__init__.py:4292
+#: models/__init__.py:2983 models/__init__.py:4295
 msgid "revision"
 msgstr ""
 
-#: models/__init__.py:2981
+#: models/__init__.py:2984
 msgid "revisions"
 msgstr ""
 
-#: models/__init__.py:3011 models/media.py:164
+#: models/__init__.py:3014 models/media.py:164
 msgid "group"
 msgstr ""
 
-#: models/__init__.py:3023 models/media.py:175
+#: models/__init__.py:3026 models/media.py:175
 msgid "permission"
 msgstr ""
 
-#: models/__init__.py:3036
+#: models/__init__.py:3039
 msgid "group page permission"
 msgstr ""
 
-#: models/__init__.py:3037
+#: models/__init__.py:3040
 msgid "group page permissions"
 msgstr ""
 
-#: models/__init__.py:3325
+#: models/__init__.py:3328
 msgid "page view restriction"
 msgstr ""
 
-#: models/__init__.py:3326
+#: models/__init__.py:3329
 msgid "page view restrictions"
 msgstr ""
 
-#: models/__init__.py:3392 models/__init__.py:3433 models/__init__.py:3704
-#: models/__init__.py:3867
+#: models/__init__.py:3395 models/__init__.py:3436 models/__init__.py:3707
+#: models/__init__.py:3870
 msgid "workflow"
 msgstr ""
 
-#: models/__init__.py:3417
+#: models/__init__.py:3420
 msgid "workflow page"
 msgstr ""
 
-#: models/__init__.py:3418
+#: models/__init__.py:3421
 msgid "workflow pages"
 msgstr ""
 
-#: models/__init__.py:3446
+#: models/__init__.py:3449
 msgid "workflow_tasks"
 msgstr ""
 
-#: models/__init__.py:3452 models/__init__.py:3608 models/__init__.py:4298
+#: models/__init__.py:3455 models/__init__.py:3611 models/__init__.py:4301
 msgid "task"
 msgstr ""
 
-#: models/__init__.py:3459
+#: models/__init__.py:3462
 msgid "workflow task order"
 msgstr ""
 
-#: models/__init__.py:3460
+#: models/__init__.py:3463
 msgid "workflow task orders"
 msgstr ""
 
-#: models/__init__.py:3472 models/__init__.py:3618 models/media.py:61
+#: models/__init__.py:3475 models/__init__.py:3621 models/media.py:61
 msgid "name"
 msgstr ""
 
-#: models/__init__.py:3480 models/__init__.py:3620
+#: models/__init__.py:3483 models/__init__.py:3623
 msgid "active"
 msgstr ""
 
-#: models/__init__.py:3483
+#: models/__init__.py:3486
 msgid ""
 "Active tasks can be added to workflows. Deactivating a task does not remove "
 "it from existing workflows."
 msgstr ""
 
-#: models/__init__.py:3609
+#: models/__init__.py:3612
 msgid "tasks"
 msgstr ""
 
-#: models/__init__.py:3623
+#: models/__init__.py:3626
 msgid ""
 "Active workflows can be added to pages/snippets. Deactivating a workflow "
 "does not remove it from existing pages/snippets."
 msgstr ""
 
-#: models/__init__.py:3705
+#: models/__init__.py:3708
 msgid "workflows"
 msgstr ""
 
-#: models/__init__.py:3716 models/view_restrictions.py:36
+#: models/__init__.py:3719 models/view_restrictions.py:36
 msgid "groups"
 msgstr ""
 
-#: models/__init__.py:3718
+#: models/__init__.py:3721
 msgid ""
 "Pages/snippets at this step in a workflow will be moderated or approved by "
 "these groups of users"
 msgstr ""
 
-#: models/__init__.py:3777
+#: models/__init__.py:3780
 msgid "Request changes"
 msgstr ""
 
-#: models/__init__.py:3778 wagtail_hooks.py:132
+#: models/__init__.py:3781 wagtail_hooks.py:132
 msgid "Approve"
 msgstr ""
 
-#: models/__init__.py:3779
+#: models/__init__.py:3782
 msgid "Approve with comment"
 msgstr ""
 
-#: models/__init__.py:3792
+#: models/__init__.py:3795
 msgid "Members of the chosen Wagtail Groups can approve this task"
 msgstr ""
 
-#: models/__init__.py:3796
+#: models/__init__.py:3799
 msgid "Group approval task"
 msgstr ""
 
-#: models/__init__.py:3797
+#: models/__init__.py:3800
 msgid "Group approval tasks"
 msgstr ""
 
-#: models/__init__.py:3845 models/__init__.py:4276
+#: models/__init__.py:3848 models/__init__.py:4279
 msgid "In progress"
 msgstr ""
 
-#: models/__init__.py:3846 models/__init__.py:4277 wagtail_hooks.py:132
+#: models/__init__.py:3849 models/__init__.py:4280 wagtail_hooks.py:132
 msgid "Approved"
 msgstr ""
 
-#: models/__init__.py:3847
+#: models/__init__.py:3850
 msgid "Needs changes"
 msgstr ""
 
-#: models/__init__.py:3848 models/__init__.py:4280
+#: models/__init__.py:3851 models/__init__.py:4283
 msgid "Cancelled"
 msgstr ""
 
-#: models/__init__.py:3872 models/__init__.py:4303
+#: models/__init__.py:3875 models/__init__.py:4306
 msgid "status"
 msgstr ""
 
-#: models/__init__.py:3879
+#: models/__init__.py:3882
 msgid "requested by"
 msgstr ""
 
-#: models/__init__.py:3891
+#: models/__init__.py:3894
 msgid "current task state"
 msgstr ""
 
-#: models/__init__.py:3921
+#: models/__init__.py:3924
 msgid ""
 "There may only be one in progress or needs changes workflow state per page/"
 "snippet."
 msgstr ""
 
-#: models/__init__.py:3931
+#: models/__init__.py:3934
 #, python-format
 msgid "Workflow '%(workflow_name)s' on %(model_name)s '%(title)s': %(status)s"
 msgstr ""
 
-#: models/__init__.py:4161
+#: models/__init__.py:4164
 msgid "Not started"
 msgstr ""
 
-#: models/__init__.py:4212
+#: models/__init__.py:4215
 msgid "Workflow state"
 msgstr ""
 
-#: models/__init__.py:4213
+#: models/__init__.py:4216
 msgid "Workflow states"
 msgstr ""
 
-#: models/__init__.py:4278 wagtail_hooks.py:133
+#: models/__init__.py:4281 wagtail_hooks.py:133
 msgid "Rejected"
 msgstr ""
 
-#: models/__init__.py:4279
+#: models/__init__.py:4282
 msgid "Skipped"
 msgstr ""
 
-#: models/__init__.py:4286
+#: models/__init__.py:4289
 msgid "workflow state"
 msgstr ""
 
-#: models/__init__.py:4307
+#: models/__init__.py:4310
 msgid "started at"
 msgstr ""
 
-#: models/__init__.py:4309
+#: models/__init__.py:4312
 msgid "finished at"
 msgstr ""
 
-#: models/__init__.py:4313
+#: models/__init__.py:4316
 msgid "finished by"
 msgstr ""
 
-#: models/__init__.py:4342
+#: models/__init__.py:4345
 #, python-format
 msgid "Task '%(task_name)s' on Revision '%(revision_info)s': %(status)s"
 msgstr ""
 
-#: models/__init__.py:4472
+#: models/__init__.py:4475
 msgid "Task state"
 msgstr ""
 
-#: models/__init__.py:4473
+#: models/__init__.py:4476
 msgid "Task states"
 msgstr ""
 
-#: models/__init__.py:4537
+#: models/__init__.py:4543
 msgid "page log entry"
 msgstr ""
 
-#: models/__init__.py:4538
+#: models/__init__.py:4544
 msgid "page log entries"
 msgstr ""
 
-#: models/__init__.py:4556
+#: models/__init__.py:4562
 msgid "Draft saved"
 msgstr ""
 
-#: models/__init__.py:4604
+#: models/__init__.py:4610
 msgid "comment"
 msgstr ""
 
-#: models/__init__.py:4605
+#: models/__init__.py:4611
 msgid "comments"
 msgstr ""
 
-#: models/__init__.py:4700
+#: models/__init__.py:4706
 msgid "comment reply"
 msgstr ""
 
-#: models/__init__.py:4701
+#: models/__init__.py:4707
 msgid "comment replies"
 msgstr ""
 
@@ -696,6 +696,10 @@ msgstr ""
 msgid "model log entries"
 msgstr ""
 
+#: models/i18n.py:185
+msgid "locale"
+msgstr ""
+
 #: models/media.py:44 models/media.py:122 models/media.py:138
 #: models/media.py:170
 msgid "collection"

wagtail/locales/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-18 17:28+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,7 +49,7 @@ msgid ""
 "language or delete this locale."
 msgstr ""
 
-#: views.py:32 wagtail_hooks.py:27
+#: views.py:32 wagtail_hooks.py:26
 msgid "Locales"
 msgstr ""
 

wagtail/locales/tests.py

@@ -1,8 +1,11 @@
+from django.contrib.auth.models import Permission
+from django.contrib.contenttypes.models import ContentType
 from django.contrib.messages import get_messages
 from django.contrib.messages.constants import ERROR
 from django.test import TestCase, override_settings
 from django.urls import reverse
 
+from wagtail import hooks
 from wagtail.admin.admin_url_finder import AdminURLFinder
 from wagtail.models import Locale, Page
 from wagtail.test.utils import WagtailTestUtils
@@ -344,3 +347,16 @@ class TestLocaleDeleteView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
 
         # Check that the locale was not deleted
         self.assertTrue(Locale.objects.filter(language_code="en").exists())
+
+
+class TestAdminPermissions(WagtailTestUtils, TestCase):
+    def test_registered_permissions(self):
+        locale_ct = ContentType.objects.get_for_model(Locale)
+        qs = Permission.objects.none()
+        for fn in hooks.get_hooks("register_permissions"):
+            qs |= fn()
+        registered_permissions = qs.filter(content_type=locale_ct)
+        self.assertEqual(
+            set(registered_permissions.values_list("codename", flat=True)),
+            {"add_locale", "change_locale", "delete_locale"},
+        )

wagtail/locales/wagtail_hooks.py

@@ -1,4 +1,3 @@
-from django.contrib.auth.models import Permission
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
@@ -30,11 +29,3 @@ def register_locales_menu_item():
         icon_name="site",
         order=603,
     )
-
-
-@hooks.register("register_permissions")
-def register_permissions():
-    return Permission.objects.filter(
-        content_type__app_label="wagtailcore",
-        codename__in=["add_locale", "change_locale", "delete_locale"],
-    )

wagtail/migrations/0094_alter_page_locale.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.6 on 2024-06-21 06:47
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wagtailcore', '0093_uploadedfile'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='page',
+            name='locale',
+            field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailcore.locale', verbose_name='locale'),
+        ),
+    ]

wagtail/models/__init__.py

@@ -17,7 +17,7 @@ import posixpath
 import uuid
 from io import StringIO
 from typing import TYPE_CHECKING
-from urllib.parse import urlparse
+from urllib.parse import urlsplit
 from warnings import warn
 
 from django import forms
@@ -702,7 +702,7 @@ class PreviewableMixin:
         """
         url = self._get_dummy_header_url(original_request)
         if url:
-            url_info = urlparse(url)
+            url_info = urlsplit(url)
             hostname = url_info.hostname
             path = url_info.path
             port = url_info.port or (443 if url_info.scheme == "https" else 80)
@@ -1291,6 +1291,9 @@ class Page(AbstractPage, index.Indexed, ClusterableModel, metaclass=PageBase):
     promote_panels = []
     settings_panels = []
 
+    # Privacy options for page
+    private_page_options = ["password", "groups", "login"]
+
     @staticmethod
     def route_for_request(request: "HttpRequest", path: str) -> RouteResult | None:
         """
@@ -1817,7 +1820,7 @@ class Page(AbstractPage, index.Indexed, ClusterableModel, metaclass=PageBase):
         This is called by Wagtail whenever a page with aliases is published.
 
         :param revision: The revision of the original page that we are updating to (used for logging purposes)
-        :type revision: PageRevision, optional
+        :type revision: Revision, Optional
         """
         specific_self = self.specific
 
@@ -2387,8 +2390,8 @@ class Page(AbstractPage, index.Indexed, ClusterableModel, metaclass=PageBase):
     ):
         """
         Copies a given page
-        :param log_action flag for logging the action. Pass None to skip logging.
-            Can be passed an action string. Defaults to 'wagtail.copy'
+
+        :param log_action: flag for logging the action. Pass None to skip logging. Can be passed an action string. Defaults to 'wagtail.copy'
         """
         return CopyPageAction(
             self,
@@ -4521,6 +4524,9 @@ class PageLogEntryManager(BaseLogEntryManager):
 
         return PageLogEntry.objects.filter(q)
 
+    def for_instance(self, instance):
+        return self.filter(page=instance)
+
 
 class PageLogEntry(BaseLogEntry):
     page = models.ForeignKey(

wagtail/models/i18n.py

@@ -9,6 +9,7 @@ from django.db.models.signals import pre_save
 from django.dispatch import receiver
 from django.utils import translation
 from django.utils.encoding import force_str
+from django.utils.translation import gettext_lazy as _
 from modelcluster.fields import ParentalKey
 
 from wagtail.actions.copy_for_translation import CopyForTranslationAction
@@ -177,7 +178,11 @@ class Locale(models.Model):
 class TranslatableMixin(models.Model):
     translation_key = models.UUIDField(default=uuid.uuid4, editable=False)
     locale = models.ForeignKey(
-        Locale, on_delete=models.PROTECT, related_name="+", editable=False
+        Locale,
+        on_delete=models.PROTECT,
+        related_name="+",
+        editable=False,
+        verbose_name=_("locale"),
     )
     locale.wagtail_reference_index_ignore = True
 

wagtail/project_template/requirements.txt

@@ -1,2 +1,2 @@
 Django>=4.2,<5.1
-wagtail>=6.1,<6.2
+wagtail==6.2rc1

wagtail/search/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-18 17:28+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wagtail/signals.py

@@ -64,3 +64,7 @@ task_cancelled = Signal()
 # Required as a workaround for https://code.djangoproject.com/ticket/6870
 # provides args: sender, instance
 pre_validate_delete = Signal()
+
+# Translation signals
+# provides args: sender, source_obj, target_obj
+copy_for_translation_done = Signal()

wagtail/sites/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-18 17:28+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgstr ""
 msgid "Choose a different root page"
 msgstr ""
 
-#: views.py:12 wagtail_hooks.py:27
+#: views.py:12 wagtail_hooks.py:26
 msgid "Sites"
 msgstr ""
 

wagtail/sites/tests.py

@@ -1,7 +1,9 @@
 from django.contrib.auth.models import Permission
+from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 from django.urls import reverse
 
+from wagtail import hooks
 from wagtail.admin.admin_url_finder import AdminURLFinder
 from wagtail.models import Page, Site
 from wagtail.test.utils import WagtailTestUtils
@@ -482,3 +484,16 @@ class TestLimitedPermissions(WagtailTestUtils, TestCase):
         # Check that the site was edited
         with self.assertRaises(Site.DoesNotExist):
             Site.objects.get(id=self.localhost.id)
+
+
+class TestAdminPermissions(WagtailTestUtils, TestCase):
+    def test_registered_permissions(self):
+        site_ct = ContentType.objects.get_for_model(Site)
+        qs = Permission.objects.none()
+        for fn in hooks.get_hooks("register_permissions"):
+            qs |= fn()
+        registered_permissions = qs.filter(content_type=site_ct)
+        self.assertEqual(
+            set(registered_permissions.values_list("codename", flat=True)),
+            {"add_site", "change_site", "delete_site"},
+        )