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

wagtail/snippets/tests/test_viewset.py

@@ -42,6 +42,7 @@ from wagtail.test.testapp.models import (
 )
 from wagtail.test.utils import WagtailTestUtils
 from wagtail.test.utils.template_tests import AdminTemplateTestUtils
+from wagtail.utils.timestamps import render_timestamp
 
 
 class TestIncorrectRegistration(SimpleTestCase):
@@ -69,8 +70,6 @@ class BaseSnippetViewSetTests(WagtailTestUtils, TestCase):
 
 
 class TestCustomIcon(BaseSnippetViewSetTests):
-    # TODO: decide what to do with this test, since the new designs after
-    # Universal Listings and unified breadcrumbs/header don't have icons
     model = FullFeaturedSnippet
 
     def setUp(self):
@@ -84,26 +83,28 @@ class TestCustomIcon(BaseSnippetViewSetTests):
     def test_get_views(self):
         pk = quote(self.object.pk)
         views = [
-            # TODO: Some of these views have been migrated to use the slim_header
-            # only, so there is no header_icon anymore.
-            # ("list", []),
-            # ("add", []),
-            # ("edit", [pk]),
-            # ("delete", [pk]),
-            # ("usage", [pk]),
-            ("unpublish", [pk]),
-            ("workflow_history", [pk]),
-            # ("revisions_revert", [pk, self.revision_1.id]),
-            ("revisions_compare", [pk, self.revision_1.id, self.revision_2.id]),
-            ("revisions_unschedule", [pk, self.revision_2.id]),
+            ("list", [], "headers/slim_header.html"),
+            ("add", [], "headers/slim_header.html"),
+            ("edit", [pk], "headers/slim_header.html"),
+            ("delete", [pk], "header.html"),
+            ("usage", [pk], "headers/slim_header.html"),
+            ("unpublish", [pk], "header.html"),
+            ("workflow_history", [pk], "header.html"),
+            ("revisions_revert", [pk, self.revision_1.id], "headers/slim_header.html"),
+            (
+                "revisions_compare",
+                [pk, self.revision_1.id, self.revision_2.id],
+                "header.html",
+            ),
+            ("revisions_unschedule", [pk, self.revision_2.id], "header.html"),
         ]
-        for view_name, args in views:
+        for view_name, args, header in views:
             with self.subTest(view_name=view_name):
                 response = self.client.get(self.get_url(view_name, args))
                 self.assertEqual(response.status_code, 200)
                 self.assertEqual(response.context["header_icon"], "cog")
                 self.assertContains(response, "icon icon-cog", count=1)
-                self.assertTemplateUsed(response, "wagtailadmin/shared/header.html")
+                self.assertTemplateUsed(response, f"wagtailadmin/shared/{header}")
 
     def test_get_history(self):
         response = self.client.get(self.get_url("history", [quote(self.object.pk)]))
@@ -112,6 +113,10 @@ class TestCustomIcon(BaseSnippetViewSetTests):
             response,
             "wagtailadmin/shared/headers/slim_header.html",
         )
+        # History view icon is not configurable for consistency with pages
+        self.assertEqual(response.context["header_icon"], "history")
+        self.assertContains(response, "icon icon-history")
+        self.assertNotContains(response, "icon icon-cog")
         self.assertTemplateNotUsed(response, "wagtailadmin/shared/header.html")
 
     def test_get_workflow_history_detail(self):
@@ -715,10 +720,12 @@ class TestListViewWithCustomColumns(BaseSnippetViewSetTests):
         # One from the country code column, another from the custom foo column
         self.assertContains(response, sort_country_code_url, count=2)
 
-        html = response.content.decode()
+        soup = self.get_soup(response.content)
+
+        headings = soup.select("#listing-results table th")
 
         # The bulk actions column plus 6 columns defined in FullFeaturedSnippetViewSet
-        self.assertTagInHTML("<th>", html, count=7, allow_extra_attrs=True)
+        self.assertEqual(len(headings), 7)
 
     def test_falsy_value(self):
         # https://github.com/wagtail/wagtail/issues/10765
@@ -769,6 +776,44 @@ class TestListViewWithCustomColumns(BaseSnippetViewSetTests):
         )
 
 
+class TestRelatedFieldListDisplay(BaseSnippetViewSetTests):
+    model = SnippetChooserModel
+
+    def setUp(self):
+        super().setUp()
+        url = "https://example.com/free_examples"
+        self.advert = Advert.objects.create(url=url, text="Free Examples")
+        self.ffs = FullFeaturedSnippet.objects.create(text="royale with cheese")
+
+    def test_empty_foreignkey(self):
+        self.no_ffs_chooser = self.model.objects.create(advert=self.advert)
+        response = self.client.get(self.get_url("list"))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Chosen snippet text")
+        self.assertContains(response, "<td></td>", html=True)
+
+    def test_single_level_relation(self):
+        self.scm = self.model.objects.create(advert=self.advert, full_featured=self.ffs)
+        response = self.client.get(self.get_url("list"))
+        self.assertEqual(response.status_code, 200)
+        soup = self.get_soup(response.content)
+        headers = [
+            header.get_text(strip=True)
+            for header in soup.select("#listing-results table th")
+        ]
+        self.assertIn("Chosen snippet text", headers)
+        self.assertContains(response, "<td>royale with cheese</td>", html=True)
+
+    def test_multi_level_relation(self):
+        self.scm = self.model.objects.create(advert=self.advert, full_featured=self.ffs)
+        dummy_revision = self.ffs.save_revision()
+        timestamp = render_timestamp(dummy_revision.created_at)
+        response = self.client.get(self.get_url("list"))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Latest revision created at")
+        self.assertContains(response, f"<td>{timestamp}</td>", html=True)
+
+
 class TestListExport(BaseSnippetViewSetTests):
     model = FullFeaturedSnippet
 

wagtail/snippets/tests/test_workflows.py

@@ -268,6 +268,18 @@ class TestWorkflowHistory(BaseWorkflowsTestCase):
 
         self.assertRedirects(response, reverse("wagtailadmin_home"))
 
+    def test_get_history_renders_comment(self):
+        self.workflow_state.current_task_state.reject(comment="Can be better")
+        # Ensure the comment in the log entry is rendered in the History view.
+        # This is the main History view and not the Workflow History view, but
+        # we test it here so we can reuse the workflow setup.
+        response = self.client.get(self.get_url("history", (quote(self.object.pk),)))
+        self.assertContains(
+            response,
+            "<div>Comment: <em>Can be better</em></div>",
+            html=True,
+        )
+
 
 class TestConfirmWorkflowCancellation(BaseWorkflowsTestCase):
     def setUp(self):

wagtail/snippets/views/snippets.py

@@ -20,10 +20,8 @@ from wagtail.admin.ui.side_panels import ChecksSidePanel, PreviewSidePanel
 from wagtail.admin.ui.tables import (
     BulkActionsCheckboxColumn,
     Column,
-    DateColumn,
     LiveStatusTagColumn,
     TitleColumn,
-    UserColumn,
 )
 from wagtail.admin.views import generic
 from wagtail.admin.views.generic import history, lock, workflow
@@ -90,7 +88,7 @@ class ModelIndexView(generic.BaseListingView):
         return [
             {
                 "name": capfirst(model._meta.verbose_name_plural),
-                "count": model.objects.all().count(),
+                "count": model._default_manager.all().count(),
                 "model": model,
             }
             for model in get_snippet_models()
@@ -235,22 +233,6 @@ class CreateView(generic.CreateEditViewOptionalFeaturesMixin, generic.CreateView
     def _get_action_menu(self):
         return SnippetActionMenu(self.request, view=self.view_name, model=self.model)
 
-    def _get_initial_form_instance(self):
-        instance = self.model()
-
-        # Set locale of the new instance
-        if self.locale:
-            instance.locale = self.locale
-
-        return instance
-
-    def get_form_kwargs(self):
-        return {
-            **super().get_form_kwargs(),
-            "instance": self._get_initial_form_instance(),
-            "for_user": self.request.user,
-        }
-
     def get_side_panels(self):
         side_panels = [
             SnippetStatusSidePanel(
@@ -310,9 +292,6 @@ class EditView(generic.CreateEditViewOptionalFeaturesMixin, generic.EditView):
             locked_for_user=self.locked_for_user,
         )
 
-    def get_form_kwargs(self):
-        return {**super().get_form_kwargs(), "for_user": self.request.user}
-
     def get_side_panels(self):
         side_panels = [
             SnippetStatusSidePanel(
@@ -363,45 +342,8 @@ class UsageView(generic.UsageView):
     view_name = "usage"
 
 
-class ActionColumn(Column):
-    cell_template_name = "wagtailsnippets/snippets/revisions/_actions.html"
-
-    def __init__(self, *args, object=None, view=None, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.object = object
-        self.view = view
-
-    def get_cell_context_data(self, instance, parent_context):
-        context = super().get_cell_context_data(instance, parent_context)
-        context["revision_enabled"] = isinstance(self.object, RevisionMixin)
-        context["draftstate_enabled"] = isinstance(self.object, DraftStateMixin)
-        context["preview_enabled"] = isinstance(self.object, PreviewableMixin)
-        context["can_publish"] = self.view.user_has_permission("publish")
-        context["object"] = self.object
-        context["view"] = self.view
-        return context
-
-
 class HistoryView(history.HistoryView):
     view_name = "history"
-    revisions_view_url_name = None
-    revisions_revert_url_name = None
-    revisions_compare_url_name = None
-    revisions_unschedule_url_name = None
-
-    @cached_property
-    def columns(self):
-        return [
-            ActionColumn(
-                "message",
-                object=self.object,
-                view=self,
-                classname="title",
-                label=_("Action"),
-            ),
-            UserColumn("user", blank_display_name="system"),
-            DateColumn("timestamp", label=_("Date")),
-        ]
 
 
 class InspectView(generic.InspectView):

wagtail/templatetags/wagtailcore_tags.py

@@ -100,7 +100,7 @@ def wagtail_release_notes_path():
 def wagtail_feature_release_whats_new_link():
     major, minor, patch, release, num = VERSION
     if release == "final":
-        return f"https://guide.wagtail.org/en-latest/releases/new-in-wagtail-{major}-{minor}/"
+        return f"https://guide.wagtail.org/en-{major}.{minor}.x/releases/new-in-wagtail-{major}-{minor}/"
     return "https://guide.wagtail.org/en-latest/releases/latest/"
 
 

wagtail/test/demosite/models.py

@@ -471,7 +471,7 @@ class EventPage(Page):
 
     def get_event_index(self):
         # Find closest ancestor which is an event index
-        return EventIndexPage.objects.ancester_of(self).last()
+        return EventIndexPage.objects.ancestor_of(self).last()
 
 
 class EventPageCarouselItem(Orderable, AbstractCarouselItem):

wagtail/test/middleware.py

@@ -1,6 +1,9 @@
-from django.http import HttpResponseForbidden
+from django.http import Http404, HttpResponse, HttpResponseForbidden
 from django.utils.deprecation import MiddlewareMixin
 
+from wagtail.models import Page
+from wagtail.views import serve
+
 
 class BlockDodgyUserAgentMiddleware(MiddlewareMixin):
     # Used to test that we're correctly handling responses returned from middleware during page
@@ -16,3 +19,13 @@ class BlockDodgyUserAgentMiddleware(MiddlewareMixin):
             and request.headers.get("user-agent") == "EvilHacker"
         ):
             return HttpResponseForbidden("Forbidden")
+
+
+class SimplePageViewInterceptorMiddleware(MiddlewareMixin):
+    def process_view(self, request, view_func, view_args, view_kwargs):
+        if serve == view_func:
+            page = Page.find_for_request(request, *view_args, **view_kwargs)
+            if page is None:
+                raise Http404
+            elif page.content == "Intercept me":
+                return HttpResponse("Intercepted")

wagtail/test/testapp/fixtures/test.json

@@ -878,6 +878,15 @@
       "file": "documents/test.pdf"
     }
   },
+  {
+    "pk": 2,
+    "model": "wagtaildocs.Document",
+    "fields": {
+      "title": "another test document",
+      "created_at": "2020-01-01T12:00:00.000Z",
+      "file": "documents/another_test.pdf"
+    }
+  },
   {
     "pk": 1,
     "model": "wagtailcore.pageviewrestriction",
@@ -915,6 +924,17 @@
       "created_at": "2014-01-01T12:00:00.000Z"
     }
   },
+  {
+    "pk": 2,
+    "model": "wagtailimages.image",
+    "fields": {
+      "title": "Another image",
+      "file": "original_images/another.jpg",
+      "width": 1000,
+      "height": 1000,
+      "created_at": "2020-01-01T12:00:00.000Z"
+    }
+  },
   {
     "model": "wagtailcore.collectionviewrestriction",
     "pk": 1,

wagtail/test/testapp/migrations/0001_squashed_0073_revisablechildmodel_secret_text.py

@@ -15,7 +15,7 @@ import wagtail.contrib.table_block.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.images.models
-import wagtail.models.collections
+import wagtail.models.media
 import wagtail.search.index
 import wagtail.test.testapp.models
 
@@ -1043,7 +1043,7 @@ class Migration(migrations.Migration):
                 (
                     "collection",
                     models.ForeignKey(
-                        default=wagtail.models.collections.get_root_collection_id,
+                        default=wagtail.models.media.get_root_collection_id,
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="+",
                         to="wagtailcore.collection",
@@ -2244,7 +2244,7 @@ class Migration(migrations.Migration):
                 (
                     "collection",
                     models.ForeignKey(
-                        default=wagtail.models.collections.get_root_collection_id,
+                        default=wagtail.models.media.get_root_collection_id,
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="+",
                         to="wagtailcore.collection",
@@ -2341,7 +2341,7 @@ class Migration(migrations.Migration):
                 (
                     "collection",
                     models.ForeignKey(
-                        default=wagtail.models.collections.get_root_collection_id,
+                        default=wagtail.models.media.get_root_collection_id,
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="+",
                         to="wagtailcore.collection",
@@ -2622,7 +2622,7 @@ class Migration(migrations.Migration):
                 (
                     "collection",
                     models.ForeignKey(
-                        default=wagtail.models.collections.get_root_collection_id,
+                        default=wagtail.models.media.get_root_collection_id,
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="+",
                         to="wagtailcore.collection",
@@ -3891,7 +3891,7 @@ class Migration(migrations.Migration):
                 (
                     "collection",
                     models.ForeignKey(
-                        default=wagtail.models.collections.get_root_collection_id,
+                        default=wagtail.models.media.get_root_collection_id,
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="+",
                         to="wagtailcore.collection",
@@ -3936,7 +3936,7 @@ class Migration(migrations.Migration):
                 (
                     "collection",
                     models.ForeignKey(
-                        default=wagtail.models.collections.get_root_collection_id,
+                        default=wagtail.models.media.get_root_collection_id,
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="+",
                         to="wagtailcore.collection",
@@ -4055,7 +4055,7 @@ class Migration(migrations.Migration):
                 (
                     "collection",
                     models.ForeignKey(
-                        default=wagtail.models.collections.get_root_collection_id,
+                        default=wagtail.models.media.get_root_collection_id,
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="+",
                         to="wagtailcore.collection",

wagtail/test/testapp/migrations/0023_snippetchoosermodel_full_featured.py

@@ -19,6 +19,7 @@ class Migration(migrations.Migration):
                 null=True,
                 on_delete=django.db.models.deletion.CASCADE,
                 to="tests.fullfeaturedsnippet",
+                verbose_name="Chosen snippet",
             ),
         ),
     ]

wagtail/test/testapp/migrations/0034_custompermissionmodel.py

@@ -0,0 +1,44 @@
+# Generated by Django 4.2.7 on 2024-02-22 09:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("tests", "0033_customcopyformpage"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="CustomPermissionModel",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("text", models.TextField(default="Tailwag")),
+            ],
+            options={
+                "verbose_name": "ADVANCED permission model",
+                "verbose_name_plural": "ADVANCED permission models",
+                "permissions": [
+                    ("can_start_trouble", "Can start trouble"),
+                    ("cause_chaos", "Cause chaos for advanced permission model"),
+                    ("change_text", "Change text"),
+                    ("control", "Manage custom permission model"),
+                ],
+                "default_permissions": (
+                    "add",
+                    "change",
+                    "delete",
+                    "view",
+                    "bulk_update",
+                ),
+            },
+        ),
+    ]

wagtail/test/testapp/migrations/0035_modelwithcustommanager.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.0.1 on 2024-03-15 21:20
+
+import django.db.models.manager
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("tests", "0034_custompermissionmodel"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="ModelWithCustomManager",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+            ],
+            managers=[
+                ("instances", django.db.models.manager.Manager()),
+            ],
+        ),
+    ]

wagtail/test/testapp/migrations/0036_complexdefaultstreampage.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.0.3 on 2024-04-15 22:12
+
+import django.db.models.deletion
+import wagtail.blocks
+import wagtail.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tests', '0035_modelwithcustommanager'),
+        ('wagtailcore', '0093_uploadedfile'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ComplexDefaultStreamPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+                ('body', wagtail.fields.StreamField([('text', wagtail.blocks.CharBlock()), ('rich_text', wagtail.blocks.RichTextBlock()), ('books', wagtail.blocks.StreamBlock([('title', wagtail.blocks.CharBlock()), ('author', wagtail.blocks.CharBlock())]))], default=[('rich_text', '<p>My <i>lovely</i> books</p>'), ('books', [('title', 'The Great Gatsby'), ('author', 'F. Scott Fitzgerald')])])),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page',),
+        ),
+    ]

wagtail/test/testapp/migrations/0037_testpermissionedgenericsetting_and_more.py

@@ -0,0 +1,42 @@
+# Generated by Django 4.2.11 on 2024-04-25 15:51
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wagtailcore', '0093_uploadedfile'),
+        ('tests', '0036_complexdefaultstreampage'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TestPermissionedGenericSetting',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100)),
+                ('sensitive_email', models.EmailField(max_length=50)),
+            ],
+            options={
+                'permissions': [('can_edit_sensitive_email_generic_setting', 'Can edit sensitive email generic setting.')],
+            },
+        ),
+        migrations.AlterModelOptions(
+            name='featurecompletetoy',
+            options={'permissions': [('can_set_release_date', 'Can set release date')]},
+        ),
+        migrations.CreateModel(
+            name='TestPermissionedSiteSetting',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100)),
+                ('sensitive_email', models.EmailField(max_length=50)),
+                ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.site')),
+            ],
+            options={
+                'permissions': [('can_edit_sensitive_email_site_setting', 'Can edit sensitive email site setting.')],
+            },
+        ),
+    ]