wagtail 5.2rc1__py3-none-any.whl → 5.2.2__py3-none-any.whl

wagtail/test/testapp/migrations/0031_searchtestmodel.py

@@ -0,0 +1,29 @@
+# Generated by Django 4.2.7 on 2023-11-08 14:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tests", "0030_purgerevisionsprotectedtestmodel"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="SearchTestModel",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("title", models.CharField(max_length=255)),
+                ("body", models.TextField()),
+            ],
+        ),
+    ]

wagtail/test/testapp/models.py

@@ -1123,6 +1123,22 @@ class FullFeaturedSnippet(
 
     some_attribute = "some value"
 
+    workflow_states = GenericRelation(
+        "wagtailcore.WorkflowState",
+        content_type_field="base_content_type",
+        object_id_field="object_id",
+        related_query_name="full_featured_snippet",
+        for_concrete_model=False,
+    )
+
+    revisions = GenericRelation(
+        "wagtailcore.Revision",
+        content_type_field="base_content_type",
+        object_id_field="object_id",
+        related_query_name="full_featured_snippet",
+        for_concrete_model=False,
+    )
+
     search_fields = [
         index.SearchField("text"),
         index.AutocompleteField("text"),
@@ -2187,3 +2203,15 @@ class PurgeRevisionsProtectedTestModel(models.Model):
     revision = models.OneToOneField(
         "wagtailcore.Revision", on_delete=models.PROTECT, related_name="+"
     )
+
+
+class SearchTestModel(models.Model):
+    title = models.CharField(max_length=255)
+    body = models.TextField()
+    panels = [
+        FieldPanel("title"),
+        FieldPanel("body"),
+    ]
+
+    def __str__(self):
+        return self.title

wagtail/test/testapp/views.py

@@ -24,6 +24,7 @@ from wagtail.test.testapp.models import (
     JSONMinMaxCountStreamModel,
     JSONStreamModel,
     ModelWithStringTypePrimaryKey,
+    SearchTestModel,
 )
 
 
@@ -196,6 +197,12 @@ class JSONModelViewSetGroup(ModelViewSetGroup):
     )
 
 
+class SearchTestModelViewSet(ModelViewSet):
+    model = SearchTestModel
+    search_fields = ["title", "body"]
+    form_fields = ["title", "body"]
+
+
 class FeatureCompleteToyViewSet(ModelViewSet):
     model = FeatureCompleteToy
     url_namespace = "feature_complete_toy"

wagtail/test/testapp/wagtail_hooks.py

@@ -35,6 +35,7 @@ from wagtail.test.testapp.models import (
 from wagtail.test.testapp.views import (
     JSONModelViewSetGroup,
     MiscellaneousViewSetGroup,
+    SearchTestModelViewSet,
     ToyViewSetGroup,
     animated_advert_chooser_viewset,
 )
@@ -242,12 +243,11 @@ def add_broken_links_summary_item(request, items):
 
 @hooks.register("register_admin_viewset")
 def register_viewsets():
-    return MiscellaneousViewSetGroup()
-
-
-@hooks.register("register_admin_viewset")
-def register_json_model_viewsets():
-    return JSONModelViewSetGroup()
+    return [
+        MiscellaneousViewSetGroup(),
+        JSONModelViewSetGroup(),
+        SearchTestModelViewSet(name="searchtest"),
+    ]
 
 
 @hooks.register("register_admin_viewset")

wagtail/tests/test_page_queryset.py

@@ -920,6 +920,25 @@ class TestSpecificQuery(WagtailTestUtils, TestCase):
         self.assertEqual(results.first().subscribers_count, 1)
         self.assertEqual(results.last().subscribers_count, 1)
 
+    def test_specific_query_with_alias(self):
+        """
+        Ensure alias() works with specific() queries.
+        See https://github.com/wagtail/wagtail/issues/11285 for more details
+        """
+
+        pages = Page.objects.live()
+        user = self.create_test_user()
+        pages.first().subscribers.create(user=user, comment_notifications=False)
+        pages.last().subscribers.create(user=user, comment_notifications=False)
+
+        # This would previously fail as described in #11285.
+        iter(
+            Page.objects.live()
+            .specific()
+            .alias(subscribers_count=Count("subscribers"))
+            .order_by("subscribers_count")
+        )
+
     def test_specific_gracefully_handles_missing_models(self):
         # 3567 - PageQuerySet.specific should gracefully handle pages whose class definition
         # is missing, by keeping them as basic Page instances.

wagtail/tests/test_revision_model.py

@@ -6,6 +6,7 @@ from freezegun import freeze_time
 
 from wagtail.models import Page, Revision, get_default_page_content_type
 from wagtail.test.testapp.models import (
+    FullFeaturedSnippet,
     RevisableGrandChildModel,
     RevisableModel,
     SimplePage,
@@ -178,3 +179,25 @@ class TestRevisableModel(TestCase):
             "SubmittedRevisionsManager is deprecated and will be removed in a future release.",
         ):
             self.assertEqual(list(Revision.submitted_revisions.all()), [revision])
+
+    def test_revision_cascade_on_object_delete(self):
+        page = self.create_page()
+        full_featured_snippet = FullFeaturedSnippet.objects.create(text="foo")
+        cases = [
+            # Tuple of (instance, cascades)
+            # For models that define a GenericRelation to Revision, the revision
+            # should be deleted when the instance is deleted.
+            (page, True),
+            (full_featured_snippet, True),
+            (self.instance, False),  # No GenericRelation to Revision
+        ]
+        for instance, cascades in cases:
+            with self.subTest(instance=instance):
+                revision = instance.save_revision()
+                query = {
+                    "base_content_type": instance.get_base_content_type(),
+                    "object_id": str(instance.pk),
+                }
+                self.assertEqual(Revision.objects.filter(**query).first(), revision)
+                instance.delete()
+                self.assertIs(Revision.objects.filter(**query).exists(), not cascades)

wagtail/tests/test_workflow.py

@@ -449,6 +449,19 @@ class TestPageWorkflows(WagtailTestUtils, TestCase):
         self.assertIsNone(self.object.locked_at)
         self.assertIsNone(self.object.locked_by)
 
+    def test_workflow_state_cascade_on_object_delete(self, cascades=True):
+        data = self.start_workflow()
+        query = {
+            "base_content_type": self.object.get_base_content_type(),
+            "object_id": str(self.object.pk),
+        }
+        self.assertEqual(
+            WorkflowState.objects.filter(**query).first(),
+            data["workflow_state"],
+        )
+        self.object.delete()
+        self.assertIs(WorkflowState.objects.filter(**query).exists(), not cascades)
+
 
 class TestSnippetWorkflows(TestPageWorkflows):
     fixtures = None
@@ -479,3 +492,10 @@ class TestSnippetWorkflowsNotLockable(TestSnippetWorkflows):
         self.assertEqual(workflow_state.workflow, workflow)
         self.assertEqual(workflow_state.content_object, self.object)
         self.assertEqual(workflow_state.status, "in_progress")
+
+    def test_workflow_state_cascade_on_object_delete(self):
+        # We expect the cascade to not happen as the model does not define
+        # a GenericRelation to WorkflowState. However, workflows should still
+        # work as expected.
+        # See https://github.com/wagtail/wagtail/issues/11300 for more details.
+        return super().test_workflow_state_cascade_on_object_delete(cascades=False)

wagtail/users/locale/af/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-18 15:24+0100\n"
+"POT-Creation-Date: 2023-10-19 23:14+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Afrikaans (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/users/locale/ar/LC_MESSAGES/django.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-18 15:24+0100\n"
+"POT-Creation-Date: 2023-10-19 23:14+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Younes Oumakhou, 2022\n"
 "Language-Team: Arabic (http://app.transifex.com/torchbox/wagtail/language/"
@@ -118,9 +118,6 @@ msgstr "نعم, احذف"
 msgid "No, don't delete"
 msgstr "لا, لا تذف"
 
-msgid "Delete group"
-msgstr "احذف المجموعة"
-
 msgid ""
 "Deleting this group will revoke this group's permissions from all member "
 "users."
@@ -132,12 +129,12 @@ msgstr "هل تريد فعلا حذف هذه الجماعة؟"
 msgid "Add group"
 msgstr "أضف جماعة"
 
-msgid "Editing"
-msgstr "تحرير"
-
 msgid "Save"
 msgstr "احفظ"
 
+msgid "Delete group"
+msgstr "احذف المجموعة"
+
 msgid "Object permissions"
 msgstr "أذونات الكائن"
 
@@ -177,33 +174,27 @@ msgstr "عذرًا ، لا توجد مجموعات تطابق \"%(query)s\""
 
 #, python-format
 msgid ""
-"There are no groups configured. Why not <a "
-"href=\"%(wagtailusers_create_group_url)s\">add some</a>?"
+"There are no groups configured. Why not <a href="
+"\"%(wagtailusers_create_group_url)s\">add some</a>?"
 msgstr ""
-"لا توجد مجموعات تم تكوينها. لماذا لا <a "
-"href=\"%(wagtailusers_create_group_url)s\">تضيف بعض</a>؟"
-
-msgid "Delete user"
-msgstr "إحذف المستخدم"
+"لا توجد مجموعات تم تكوينها. لماذا لا <a href="
+"\"%(wagtailusers_create_group_url)s\">تضيف بعض</a>؟"
 
 msgid "Are you sure you want to delete this user?"
 msgstr "هل أنت متأكد من حذف هذا المستخدم؟ "
 
-msgid "Add user"
-msgstr "أضف مستخدم"
-
 msgid "Account"
 msgstr "حساب"
 
 msgid "Roles"
 msgstr "الأدوار"
 
-msgid "Users"
-msgstr "مستخدمين"
-
-msgid "Add a user"
+msgid "Add user"
 msgstr "أضف مستخدم"
 
+msgid "Delete user"
+msgstr "إحذف المستخدم"
+
 msgid "Username"
 msgstr "إسم المستخدم"
 
@@ -260,6 +251,12 @@ msgstr "من غير الممكن حفظ المجموعة بسبب أخطاء"
 msgid "Group '%(object)s' deleted."
 msgstr "تم حذف المجموعة '%(object)s'."
 
+msgid "Add a user"
+msgstr "أضف مستخدم"
+
+msgid "Users"
+msgstr "مستخدمين"
+
 #, python-format
 msgid "User '%(object)s' updated."
 msgstr "تم تحديث المستخدم '%(object)s'."
@@ -267,19 +264,9 @@ msgstr "تم تحديث المستخدم '%(object)s'."
 msgid "The user could not be saved due to errors."
 msgstr "من غير الممكن حفظ المستخدم بسبب أخطاء"
 
-#, python-format
-msgid "Editing %(object)s"
-msgstr "جاري التعديل %(object)s"
-
 #, python-format
 msgid "User '%(object)s' deleted."
 msgstr "تم حذف المستخدم '%(object)s'."
 
 msgid "Edit"
 msgstr "تحرير"
-
-msgid "Edit this user"
-msgstr "تحرير هذا المستخدم"
-
-msgid "Delete this user"
-msgstr "إحذف هذا المستخدم"

wagtail/users/locale/az_AZ/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-18 15:24+0100\n"
+"POT-Creation-Date: 2023-10-19 23:14+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Azerbaijani (Azerbaijan) (http://app.transifex.com/torchbox/"
@@ -21,9 +21,6 @@ msgstr ""
 msgid "Delete"
 msgstr "Silmək"
 
-msgid "Editing"
-msgstr "Düzəliş edilir"
-
 msgid "Save"
 msgstr "Yadda saxla"
 

wagtail/users/locale/be/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-18 15:24+0100\n"
+"POT-Creation-Date: 2023-10-19 23:14+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Andrei Satsevich, 2023\n"
 "Language-Team: Belarusian (http://app.transifex.com/torchbox/wagtail/"
@@ -18,9 +18,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: be\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || "
-"(n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
 msgid "Wagtail users"
 msgstr "Карыстальнік Wagtail"
@@ -212,9 +212,6 @@ msgstr "Так, змяніць стан"
 msgid "No, don't change state"
 msgstr "Не, не мяняць стан"
 
-msgid "Delete group"
-msgstr "Выдаліць гурт"
-
 #, python-format
 msgid ""
 "The group '%(group_name)s' has <strong>%(group_user_count)s</strong> member."
@@ -246,15 +243,15 @@ msgstr "Вы сапраўды хочаце выдаліць гэты гурт?"
 msgid "Add group"
 msgstr "Дадаць гурт"
 
-msgid "Editing"
-msgstr "Рэдактаванне"
-
 msgid "View users in this group"
 msgstr "Прагляд карыстальнікаў групы"
 
 msgid "Save"
 msgstr "Захаваць"
 
+msgid "Delete group"
+msgstr "Выдаліць гурт"
+
 msgid "Object permissions"
 msgstr "Дазвол аб'ектаў"
 
@@ -297,33 +294,27 @@ msgstr "Нажаль, ніводны гурт не адпавядае \"%(query)
 
 #, python-format
 msgid ""
-"There are no groups configured. Why not <a "
-"href=\"%(wagtailusers_create_group_url)s\">add some</a>?"
+"There are no groups configured. Why not <a href="
+"\"%(wagtailusers_create_group_url)s\">add some</a>?"
 msgstr ""
-"Гурты не настроенныя. Давай дададзім <a "
-"href=\"%(wagtailusers_create_group_url)s\">дадай трохі</a>?"
-
-msgid "Delete user"
-msgstr "Выдаліць карыстальніка"
+"Гурты не настроенныя. Давай дададзім <a href="
+"\"%(wagtailusers_create_group_url)s\">дадай трохі</a>?"
 
 msgid "Are you sure you want to delete this user?"
 msgstr "Вы ўпэўнены, што хочаце выдаліць гэтага карыстальніка?"
 
-msgid "Add user"
-msgstr "Дадаць карыстальніка"
-
 msgid "Account"
 msgstr "Уліковы запіс"
 
 msgid "Roles"
 msgstr "Ролі"
 
-msgid "Users"
-msgstr "Карыстальнікі"
-
-msgid "Add a user"
+msgid "Add user"
 msgstr "Дадаць карыстальніка"
 
+msgid "Delete user"
+msgstr "Выдаліць карыстальніка"
+
 msgid "Select all users in listing"
 msgstr "Выбраць усіх карыстальнікаў у спісе"
 
@@ -364,16 +355,16 @@ msgstr ""
 
 #, python-format
 msgid ""
-"The %(group_name)s group has no users configured. Why not <a "
-"href=\"%(wagtailusers_add_url)s\">add some</a>?"
+"The %(group_name)s group has no users configured. Why not <a href="
+"\"%(wagtailusers_add_url)s\">add some</a>?"
 msgstr ""
-"Гурт %(group_name)s не ўтрымлівае карыстальнікаў. Чаму б не <a "
-"href=\"%(wagtailusers_add_url)s\">дадаць некалькі </a>?"
+"Гурт %(group_name)s не ўтрымлівае карыстальнікаў. Чаму б не <a href="
+"\"%(wagtailusers_add_url)s\">дадаць некалькі </a>?"
 
 #, python-format
 msgid ""
-"There are no users configured. Why not <a "
-"href=\"%(wagtailusers_add_url)s\">add some</a>?"
+"There are no users configured. Why not <a href=\"%(wagtailusers_add_url)s"
+"\">add some</a>?"
 msgstr ""
 "Карыстальнікі не сканфігураваны. <a href=\"%(wagtailusers_add_url)s\"> "
 "дадаць карыстальніка </a>?"
@@ -404,6 +395,9 @@ msgstr[1] "%(num_parent_objects)d карыстальніка выдалілі"
 msgstr[2] "%(num_parent_objects)d карыстальнікаў выдалілі"
 msgstr[3] "%(num_parent_objects)d карыстальнікаў выдалілі"
 
+msgid "Mark as active"
+msgstr "Пазначыць як актыўны"
+
 msgid "Change the active state for selected users"
 msgstr "Змяніць актыўны стан для выбраных карыстальнікаў"
 
@@ -447,6 +441,12 @@ msgstr "Гурт не можа быць захавана з-за памылкі.
 msgid "Group '%(object)s' deleted."
 msgstr "Гурт '%(object)s' выдалены."
 
+msgid "Add a user"
+msgstr "Дадаць карыстальніка"
+
+msgid "Users"
+msgstr "Карыстальнікі"
+
 #, python-format
 msgid "User '%(object)s' created."
 msgstr "Карыстальнік '%(object)s' створан."
@@ -458,10 +458,6 @@ msgstr "Карыстальнік '%(object)s' адноўлены."
 msgid "The user could not be saved due to errors."
 msgstr "Карыстальнік не можа быць захавана з-за памылкі."
 
-#, python-format
-msgid "Editing %(object)s"
-msgstr "Рэдагаванне %(object)s"
-
 #, python-format
 msgid "User '%(object)s' deleted."
 msgstr "Карыстальнік '%(object)s' выдалены."
@@ -469,8 +465,10 @@ msgstr "Карыстальнік '%(object)s' выдалены."
 msgid "Edit"
 msgstr "Рэдактаванне"
 
-msgid "Edit this user"
-msgstr "Рэдактаваць гэтага карыстальніка"
+#, python-format
+msgid "Edit user '%(name)s'"
+msgstr "Рэдагаваць карыстальніка '%(name)s'"
 
-msgid "Delete this user"
-msgstr "Выдаліць гэтага карыстальніка"
+#, python-format
+msgid "Delete user '%(name)s'"
+msgstr "Выдаліць карыстальніка '%(name)s'"

wagtail/users/locale/bg/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-18 15:24+0100\n"
+"POT-Creation-Date: 2023-10-19 23:14+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Lyuboslav  Petrov <petrov.lyuboslav@gmail.com>, 2014\n"
 "Language-Team: Bulgarian (http://app.transifex.com/torchbox/wagtail/language/"
@@ -59,9 +59,6 @@ msgstr "Изтрий"
 msgid "Yes, delete"
 msgstr "Да, изтрий го"
 
-msgid "Editing"
-msgstr "Редактиране"
-
 msgid "Save"
 msgstr "Запази"
 
@@ -71,19 +68,13 @@ msgstr "Име"
 msgid "Publish"
 msgstr "Публикувай"
 
-msgid "Add user"
-msgstr "Добави потребител"
-
 msgid "Account"
 msgstr "Потребителски профил"
 
 msgid "Roles"
 msgstr "Роля"
 
-msgid "Users"
-msgstr "Потребители"
-
-msgid "Add a user"
+msgid "Add user"
 msgstr "Добави потребител"
 
 msgid "Username"
@@ -101,6 +92,12 @@ msgstr "Активен"
 msgid "Inactive"
 msgstr "Неактивен"
 
+msgid "Add a user"
+msgstr "Добави потребител"
+
+msgid "Users"
+msgstr "Потребители"
+
 #, python-format
 msgid "User '%(object)s' updated."
 msgstr "Потребител '%(object)s' обновен."

wagtail/users/locale/bn/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-18 15:24+0100\n"
+"POT-Creation-Date: 2023-10-19 23:14+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bengali (http://app.transifex.com/torchbox/wagtail/language/"
@@ -30,9 +30,6 @@ msgstr "নামের শেষাংশ"
 msgid "Delete"
 msgstr "মুছে ফেলুন "
 
-msgid "Editing"
-msgstr "সম্পাদিত হচ্ছে"
-
 msgid "Save"
 msgstr "সংরক্ষণ"