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

wagtail/snippets/locale/de/LC_MESSAGES/django.po

@@ -88,7 +88,7 @@ msgid "Wagtail snippets"
 msgstr "Wagtail Schnipsel"
 
 msgid "Delete selected snippets"
-msgstr "Ausgewählte Schnipsel löschen"
+msgstr "Ausgewählte Elemente löschen"
 
 #, python-format
 msgid "%(model_name)s '%(object)s' deleted."
@@ -116,8 +116,7 @@ msgstr[1] "%(usage_count)s mal benutzt"
 #, python-format
 msgid "Are you sure you want to delete this %(snippet_type_name)s?"
 msgstr ""
-"Sind Sie sicher, dass Sie das „%(snippet_type_name)s“ Schnipsel löschen "
-"wollen?"
+"Sind Sie sicher, dass Sie das „%(snippet_type_name)s“-Objekt löschen wollen?"
 
 #, python-format
 msgid "Are you sure you want to delete %(count)s %(snippet_type_name)s?"
@@ -144,7 +143,7 @@ msgstr "Nein, nicht löschen"
 #, python-format
 msgid "Sorry, no snippets match \"<em>%(search_query)s</em>\""
 msgstr ""
-"Es gibt leider keine Schnipsel zum Suchbegriff \"<em>%(search_query)s</em>\""
+"Es gibt leider keine Objekte zum Suchbegriff \"<em>%(search_query)s</em>\""
 
 #, python-format
 msgid ""
@@ -152,7 +151,7 @@ msgid ""
 "href=\"%(wagtailsnippets_create_snippet_url)s\" target=\"_blank\" "
 "rel=\"noreferrer\">create one now</a>?"
 msgstr ""
-"Sie haben keine „%(snippet_type_name)s“-Schnipsel erstellt. Warum nicht <a "
+"Sie haben keine „%(snippet_type_name)s“-Objekte erstellt. Warum nicht <a "
 "href=\"%(wagtailsnippets_create_snippet_url)s\" target=\"_blank\" "
 "rel=\"noreferrer\">ein neues erstellen</a>?"
 
@@ -178,7 +177,7 @@ msgid "Actions"
 msgstr "Aktionen"
 
 msgid "Select all snippets in listing"
-msgstr "Alle Schnipsel in der Aufzählung auswählen"
+msgstr "Alle Elemente in der Aufzählung auswählen"
 
 msgid "Live version"
 msgstr "Live-Version"

wagtail/snippets/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-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-04-18 17:28+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"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: action_menu.py:70
-#: templates/wagtailsnippets/snippets/action_menu/publish.html:13
+#: templates/wagtailsnippets/snippets/action_menu/publish.html:15
 msgid "Publish"
 msgstr ""
 
@@ -54,7 +54,7 @@ msgid "Delete"
 msgstr ""
 
 #: action_menu.py:239
-#: templates/wagtailsnippets/snippets/action_menu/save.html:25
+#: templates/wagtailsnippets/snippets/action_menu/save.html:27
 msgid "Save"
 msgstr ""
 
@@ -145,27 +145,27 @@ msgid ""
 "rel=\"noreferrer\">create one now</a>?"
 msgstr ""
 
-#: templates/wagtailsnippets/snippets/action_menu/publish.html:9
+#: templates/wagtailsnippets/snippets/action_menu/publish.html:11
 msgid "Publishing…"
 msgstr ""
 
-#: templates/wagtailsnippets/snippets/action_menu/publish.html:13
+#: templates/wagtailsnippets/snippets/action_menu/publish.html:15
 msgid "Publish this version"
 msgstr ""
 
-#: templates/wagtailsnippets/snippets/action_menu/save.html:7
+#: templates/wagtailsnippets/snippets/action_menu/save.html:9
 msgid "Saving…"
 msgstr ""
 
-#: templates/wagtailsnippets/snippets/action_menu/save.html:18
+#: templates/wagtailsnippets/snippets/action_menu/save.html:20
 msgid "Replace current draft"
 msgstr ""
 
-#: templates/wagtailsnippets/snippets/action_menu/save.html:20
+#: templates/wagtailsnippets/snippets/action_menu/save.html:22
 msgid "Replace current revision"
 msgstr ""
 
-#: templates/wagtailsnippets/snippets/action_menu/save.html:23
+#: templates/wagtailsnippets/snippets/action_menu/save.html:25
 msgid "Save draft"
 msgstr ""
 
@@ -178,79 +178,39 @@ msgstr ""
 msgid "Select all snippets in listing"
 msgstr ""
 
-#: templates/wagtailsnippets/snippets/revisions/_actions.html:9
-msgid "Live version"
-msgstr ""
-
-#: templates/wagtailsnippets/snippets/revisions/_actions.html:10
-msgid "Current draft"
-msgstr ""
-
-#: templates/wagtailsnippets/snippets/revisions/_actions.html:15
-msgid "Preview"
-msgstr ""
-
-#: templates/wagtailsnippets/snippets/revisions/_actions.html:18
-msgid "Edit"
-msgstr ""
-
-#: templates/wagtailsnippets/snippets/revisions/_actions.html:20
-msgid "Review this version"
-msgstr ""
-
-#: templates/wagtailsnippets/snippets/revisions/_actions.html:23
-msgid "Compare with previous version"
-msgstr ""
-
-#: templates/wagtailsnippets/snippets/revisions/_actions.html:26
-msgid "Compare with current version"
-msgstr ""
-
-#: templates/wagtailsnippets/snippets/revisions/_actions.html:29
-msgid "Cancel scheduled publish"
-msgstr ""
-
 #: views/chooser.py:21
 msgid "Choose"
 msgstr ""
 
-#: views/snippets.py:79 views/snippets.py:106 views/snippets.py:952
+#: views/snippets.py:77 views/snippets.py:104 views/snippets.py:913
 #: wagtail_hooks.py:44
 msgid "Snippets"
 msgstr ""
 
-#: views/snippets.py:119
+#: views/snippets.py:117
 msgid "Name"
 msgstr ""
 
-#: views/snippets.py:125
+#: views/snippets.py:123
 msgid "Instances"
 msgstr ""
 
-#: views/snippets.py:216
+#: views/snippets.py:214
 #, python-format
 msgid "More options for '%(title)s'"
 msgstr ""
 
-#: views/snippets.py:400
-msgid "Action"
-msgstr ""
-
-#: views/snippets.py:403
-msgid "Date"
-msgstr ""
-
-#: views/snippets.py:428
+#: views/snippets.py:389
 #, python-format
 msgid "Edit this %(model_name)s"
 msgstr ""
 
-#: views/snippets.py:434
+#: views/snippets.py:395
 #, python-format
 msgid "%(model_name)s history"
 msgstr ""
 
-#: views/snippets.py:951
+#: views/snippets.py:912
 msgid "Home"
 msgstr ""
 

wagtail/snippets/static/wagtailsnippets/js/snippet-chooser-telepath.js

@@ -1 +1 @@
-(()=>{"use strict";var e,r={1981:(e,r,t)=>{var o=t(6024),a=t(211);class n extends o.sf{getURLParams(e){const r=super.getURLParams(e);return wagtailConfig.ACTIVE_CONTENT_LOCALE&&(r.locale=wagtailConfig.ACTIVE_CONTENT_LOCALE),r}}class i extends a.I{titleStateKey="string";chooserModalClass=n}class l extends a.G{widgetClass=i;chooserModalClass=n}window.telepath.register("wagtail.snippets.widgets.SnippetChooser",l)},5311:e=>{e.exports=jQuery}},t={};function o(e){var a=t[e];if(void 0!==a)return a.exports;var n=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(n.exports,n,n.exports,o),n.loaded=!0,n.exports}o.m=r,e=[],o.O=(r,t,a,n)=>{if(!t){var i=1/0;for(u=0;u<e.length;u++){for(var[t,a,n]=e[u],l=!0,s=0;s<t.length;s++)(!1&n||i>=n)&&Object.keys(o.O).every((e=>o.O[e](t[s])))?t.splice(s--,1):(l=!1,n<i&&(i=n));if(l){e.splice(u--,1);var d=a();void 0!==d&&(r=d)}}return r}n=n||0;for(var u=e.length;u>0&&e[u-1][2]>n;u--)e[u]=e[u-1];e[u]=[t,a,n]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),o.j=383,(()=>{var e={383:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var a,n,[i,l,s]=t,d=0;if(i.some((r=>0!==e[r]))){for(a in l)o.o(l,a)&&(o.m[a]=l[a]);if(s)var u=s(o)}for(r&&r(t);d<i.length;d++)n=i[d],o.o(e,n)&&e[n]&&e[n][0](),e[n]=0;return o.O(u)},t=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})();var a=o.O(void 0,[751],(()=>o(1981)));a=o.O(a)})();
+(()=>{"use strict";var e,r={8039:(e,r,t)=>{var o=t(2614),a=t(9465);class n extends o.ZZ{getURLParams(e){const r=super.getURLParams(e);return wagtailConfig.ACTIVE_CONTENT_LOCALE&&(r.locale=wagtailConfig.ACTIVE_CONTENT_LOCALE),r}}class i extends a.y{titleStateKey="string";chooserModalClass=n}class l extends a._{widgetClass=i;chooserModalClass=n}window.telepath.register("wagtail.snippets.widgets.SnippetChooser",l)},1669:e=>{e.exports=jQuery}},t={};function o(e){var a=t[e];if(void 0!==a)return a.exports;var n=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(n.exports,n,n.exports,o),n.loaded=!0,n.exports}o.m=r,e=[],o.O=(r,t,a,n)=>{if(!t){var i=1/0;for(u=0;u<e.length;u++){for(var[t,a,n]=e[u],l=!0,s=0;s<t.length;s++)(!1&n||i>=n)&&Object.keys(o.O).every((e=>o.O[e](t[s])))?t.splice(s--,1):(l=!1,n<i&&(i=n));if(l){e.splice(u--,1);var d=a();void 0!==d&&(r=d)}}return r}n=n||0;for(var u=e.length;u>0&&e[u-1][2]>n;u--)e[u]=e[u-1];e[u]=[t,a,n]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),o.j=474,(()=>{var e={474:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var a,n,[i,l,s]=t,d=0;if(i.some((r=>0!==e[r]))){for(a in l)o.o(l,a)&&(o.m[a]=l[a]);if(s)var u=s(o)}for(r&&r(t);d<i.length;d++)n=i[d],o.o(e,n)&&e[n]&&e[n][0](),e[n]=0;return o.O(u)},t=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})();var a=o.O(void 0,[321],(()=>o(8039)));a=o.O(a)})();

wagtail/snippets/static/wagtailsnippets/js/snippet-chooser.js

@@ -1 +1 @@
-(()=>{"use strict";var e,r={1183:(e,r,t)=>{var o=t(6024),a=t(211);class n extends o.sf{getURLParams(e){const r=super.getURLParams(e);return wagtailConfig.ACTIVE_CONTENT_LOCALE&&(r.locale=wagtailConfig.ACTIVE_CONTENT_LOCALE),r}}class i extends a.I{titleStateKey="string";chooserModalClass=n}window.SnippetChooser=i},5311:e=>{e.exports=jQuery}},t={};function o(e){var a=t[e];if(void 0!==a)return a.exports;var n=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(n.exports,n,n.exports,o),n.loaded=!0,n.exports}o.m=r,e=[],o.O=(r,t,a,n)=>{if(!t){var i=1/0;for(u=0;u<e.length;u++){for(var[t,a,n]=e[u],l=!0,s=0;s<t.length;s++)(!1&n||i>=n)&&Object.keys(o.O).every((e=>o.O[e](t[s])))?t.splice(s--,1):(l=!1,n<i&&(i=n));if(l){e.splice(u--,1);var d=a();void 0!==d&&(r=d)}}return r}n=n||0;for(var u=e.length;u>0&&e[u-1][2]>n;u--)e[u]=e[u-1];e[u]=[t,a,n]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),o.j=602,(()=>{var e={602:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var a,n,[i,l,s]=t,d=0;if(i.some((r=>0!==e[r]))){for(a in l)o.o(l,a)&&(o.m[a]=l[a]);if(s)var u=s(o)}for(r&&r(t);d<i.length;d++)n=i[d],o.o(e,n)&&e[n]&&e[n][0](),e[n]=0;return o.O(u)},t=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})();var a=o.O(void 0,[751],(()=>o(1183)));a=o.O(a)})();
+(()=>{"use strict";var e,r={9987:(e,r,t)=>{var o=t(2614),a=t(9465);class n extends o.ZZ{getURLParams(e){const r=super.getURLParams(e);return wagtailConfig.ACTIVE_CONTENT_LOCALE&&(r.locale=wagtailConfig.ACTIVE_CONTENT_LOCALE),r}}class i extends a.y{titleStateKey="string";chooserModalClass=n}window.SnippetChooser=i},1669:e=>{e.exports=jQuery}},t={};function o(e){var a=t[e];if(void 0!==a)return a.exports;var n=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(n.exports,n,n.exports,o),n.loaded=!0,n.exports}o.m=r,e=[],o.O=(r,t,a,n)=>{if(!t){var i=1/0;for(u=0;u<e.length;u++){for(var[t,a,n]=e[u],l=!0,s=0;s<t.length;s++)(!1&n||i>=n)&&Object.keys(o.O).every((e=>o.O[e](t[s])))?t.splice(s--,1):(l=!1,n<i&&(i=n));if(l){e.splice(u--,1);var d=a();void 0!==d&&(r=d)}}return r}n=n||0;for(var u=e.length;u>0&&e[u-1][2]>n;u--)e[u]=e[u-1];e[u]=[t,a,n]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),o.j=686,(()=>{var e={686:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var a,n,[i,l,s]=t,d=0;if(i.some((r=>0!==e[r]))){for(a in l)o.o(l,a)&&(o.m[a]=l[a]);if(s)var u=s(o)}for(r&&r(t);d<i.length;d++)n=i[d],o.o(e,n)&&e[n]&&e[n][0](),e[n]=0;return o.O(u)},t=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})();var a=o.O(void 0,[321],(()=>o(9987)));a=o.O(a)})();

wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/publish.html

@@ -4,8 +4,10 @@
     name="{{ name }}"
     value="{{ name }}"
     class="button action-save button-longrunning{% if is_revision %} warning{% endif %}"
-    data-controller="w-progress"
+    data-controller="w-progress w-kbd"
     data-action="w-progress#activate"
+    data-w-kbd-key-value="mod+s"
+    data-w-kbd-scope-value="global"
     data-w-progress-active-value="{% trans 'Publishing…' %}"
 >
     {% icon name=icon_name classname="button-longrunning__icon" %}

wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/save.html

@@ -2,8 +2,10 @@
 <button
     type="submit"
     class="button action-save button-longrunning{% if is_revision %} warning{% endif %}"
-    data-controller="w-progress"
+    data-controller="w-progress w-kbd"
     data-action="w-progress#activate"
+    data-w-kbd-key-value="mod+s"
+    data-w-kbd-scope-value="global"
     data-w-progress-active-value="{% trans 'Saving…' %}"
 >
     {% if draftstate_enabled %}

wagtail/snippets/templates/wagtailsnippets/snippets/create.html

@@ -7,7 +7,7 @@
         context variables from the view. As a result, we can't reuse the include from the generic
         template and have to copy it here without the `only` keyword.
     {% endcomment %}
-    {% include 'wagtailadmin/shared/headers/slim_header.html' with breadcrumbs_items=breadcrumbs_items side_panels=side_panels history_url=history_url %}
+    {% include 'wagtailadmin/shared/headers/slim_header.html' with breadcrumbs_items=breadcrumbs_items side_panels=side_panels history_url=history_url buttons=header_buttons %}
 {% endblock %}
 
 {% block actions %}

wagtail/snippets/templates/wagtailsnippets/snippets/edit.html

@@ -8,7 +8,7 @@
         context variables from the view. As a result, we can't reuse the include from the generic
         template and have to copy it here without the `only` keyword.
     {% endcomment %}
-    {% include 'wagtailadmin/shared/headers/slim_header.html' with breadcrumbs_items=breadcrumbs_items side_panels=side_panels history_url=history_url %}
+    {% include 'wagtailadmin/shared/headers/slim_header.html' with breadcrumbs_items=breadcrumbs_items side_panels=side_panels history_url=history_url buttons=header_buttons %}
 {% endblock %}
 
 {% block actions %}

wagtail/snippets/tests/test_preview.py

@@ -297,10 +297,16 @@ class TestEnablePreview(WagtailTestUtils, TestCase):
         self.assertEqual(response.status_code, 200)
 
         # Should show the preview panel
-        self.assertContains(response, 'data-side-panel-toggle="preview"')
         self.assertContains(response, 'data-side-panel="preview"')
         self.assertContains(response, 'data-action="%s"' % preview_url)
 
+        # Should have the preview side panel toggle button
+        soup = self.get_soup(response.content)
+        toggle_button = soup.find("button", {"data-side-panel-toggle": "preview"})
+        self.assertIsNotNone(toggle_button)
+        self.assertEqual("w-tooltip w-kbd", toggle_button["data-controller"])
+        self.assertEqual("mod+p", toggle_button["data-w-kbd-key-value"])
+
         # Should show the iframe
         self.assertContains(
             response,
@@ -471,9 +477,14 @@ class TestDisablePreviewWithEmptyModes(WagtailTestUtils, TestCase):
         preview_url = self.get_url(
             "revisions_view", args=(self.snippet.pk, latest_revision.id)
         )
-        self.assertNotContains(response, "Preview")
+
         self.assertNotContains(response, preview_url)
 
+        soup = self.get_soup(response.content)
+
+        preview_link = soup.find("a", {"href": preview_url})
+        self.assertIsNone(preview_link)
+
 
 class TestDisablePreviewWithoutMixin(TestDisablePreviewWithEmptyModes):
     """

wagtail/snippets/tests/test_snippets.py

@@ -1095,7 +1095,7 @@ class TestCreateDraftStateSnippet(WagtailTestUtils, TestCase):
         # The publish button should have name="action-publish"
         self.assertContains(
             response,
-            '<button\n    type="submit"\n    name="action-publish"\n    value="action-publish"\n    class="button action-save button-longrunning"\n    data-controller="w-progress"\n    data-action="w-progress#activate"\n',
+            '<button\n    type="submit"\n    name="action-publish"\n    value="action-publish"\n    class="button action-save button-longrunning"\n    data-controller="w-progress w-kbd"\n    data-action="w-progress#activate"\n    data-w-kbd-key-value="mod+s"\n',
         )
         # The status side panel should be rendered so that the
         # publishing schedule can be configured
@@ -1598,13 +1598,13 @@ class TestSnippetEditView(BaseTestSnippetEditView):
         expected_url = "/admin/snippets/tests/advert/edit/%d/" % self.test_snippet.pk
         self.assertEqual(url_finder.get_edit_url(self.test_snippet), expected_url)
 
-    def test_non_existant_model(self):
+    def test_non_existent_model(self):
         response = self.client.get(
             f"/admin/snippets/tests/foo/edit/{quote(self.test_snippet.pk)}/"
         )
         self.assertEqual(response.status_code, 404)
 
-    def test_nonexistant_id(self):
+    def test_nonexistent_id(self):
         response = self.client.get(
             reverse("wagtailsnippets_tests_advert:edit", args=[999999])
         )
@@ -1906,7 +1906,7 @@ class TestEditDraftStateSnippet(BaseTestSnippetEditView):
         # The publish button should have name="action-publish"
         self.assertContains(
             response,
-            '<button\n    type="submit"\n    name="action-publish"\n    value="action-publish"\n    class="button action-save button-longrunning"\n    data-controller="w-progress"\n    data-action="w-progress#activate"\n',
+            '<button\n    type="submit"\n    name="action-publish"\n    value="action-publish"\n    class="button action-save button-longrunning"\n    data-controller="w-progress w-kbd"\n    data-action="w-progress#activate"\n    data-w-kbd-key-value="mod+s"\n',
         )
 
         # The status side panel should show "No publishing schedule set" info
@@ -2407,12 +2407,13 @@ class TestEditDraftStateSnippet(BaseTestSnippetEditView):
         )
         self.assertContains(response, "Unpublish")
 
-        # Should use the latest draft content for the title
-        self.assertContains(
-            response,
-            '<h2 class="w-header__title" id="header-title">Draft-enabled Bar, In Draft</h2>',
-            html=True,
-        )
+        soup = self.get_soup(response.content)
+        h2 = soup.select_one("#header-title")
+        self.assertIsNotNone(h2)
+        icon = h2.select_one("svg use")
+        self.assertIsNotNone(icon)
+        self.assertEqual(icon["href"], "#icon-snippet")
+        self.assertEqual(h2.text.strip(), "Draft-enabled Bar, In Draft")
 
         # Should use the latest draft content for the form
         self.assertTagInHTML(
@@ -4157,7 +4158,7 @@ class TestSnippetHistory(WagtailTestUtils, TestCase):
     def test_simple(self):
         response = self.get(self.non_revisable_snippet)
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, '<td class="title">Created</td>', html=True)
+        self.assertContains(response, "<td>Created</td>", html=True)
         self.assertContains(
             response,
             'data-w-tooltip-content-value="Sept. 30, 2021, 10:01 a.m."',
@@ -4189,7 +4190,7 @@ class TestSnippetHistory(WagtailTestUtils, TestCase):
         edit_url = self.get_url(self.non_revisable_snippet, "edit")
         self.assertNotContains(
             response,
-            f'<a href="{edit_url}" class="button button-small button-secondary">Edit</a>',
+            f'<a href="{edit_url}">Edit</a>',
         )
 
     def test_should_show_actions_on_revisable_snippet(self):
@@ -4212,14 +4213,14 @@ class TestSnippetHistory(WagtailTestUtils, TestCase):
         # The latest revision should have an "Edit" action instead of "Review"
         self.assertContains(
             response,
-            f'<a href="{edit_url}" class="button button-small button-secondary">Edit</a>',
+            f'<a href="{edit_url}">Edit</a>',
             count=1,
         )
 
         # Any other revision should have a "Review" action
         self.assertContains(
             response,
-            f'<a href="{revert_url}" class="button button-small button-secondary">Review this version</a>',
+            f'<a href="{revert_url}">Review this version</a>',
             count=1,
         )
 
@@ -4261,6 +4262,24 @@ class TestSnippetHistory(WagtailTestUtils, TestCase):
         response = self.get(self.revisable_snippet)
         self.assertEqual(response.status_code, 200)
 
+    def test_num_queries(self):
+        snippet = self.revisable_snippet
+
+        # Warm up the cache
+        self.get(snippet)
+
+        with self.assertNumQueries(14):
+            self.get(snippet)
+
+        for i in range(20):
+            revision = snippet.save_revision(user=self.user, log_action=True)
+            if i % 5 == 0:
+                revision.publish(user=self.user, log_action=True)
+
+        # Should have the same number of queries as before (no N+1 queries)
+        with self.assertNumQueries(14):
+            self.get(snippet)
+
 
 class TestSnippetRevisions(WagtailTestUtils, TestCase):
     @property
@@ -4363,7 +4382,7 @@ class TestSnippetRevisions(WagtailTestUtils, TestCase):
         # The publish button should have name="action-publish"
         self.assertContains(
             response,
-            '<button\n    type="submit"\n    name="action-publish"\n    value="action-publish"\n    class="button action-save button-longrunning warning"\n    data-controller="w-progress"\n    data-action="w-progress#activate"\n',
+            '<button\n    type="submit"\n    name="action-publish"\n    value="action-publish"\n    class="button action-save button-longrunning warning"\n    data-controller="w-progress w-kbd"\n    data-action="w-progress#activate"\n    data-w-kbd-key-value="mod+s"\n',
         )
 
         # Should not show the Unpublish action menu item
@@ -4409,10 +4428,16 @@ class TestSnippetRevisions(WagtailTestUtils, TestCase):
 
         # Should show the preview panel
         preview_url = self.get_url("preview_on_edit")
-        self.assertContains(response, 'data-side-panel-toggle="preview"')
         self.assertContains(response, 'data-side-panel="preview"')
         self.assertContains(response, f'data-action="{preview_url}"')
 
+        # Should have the preview side panel toggle button
+        soup = self.get_soup(response.content)
+        toggle_button = soup.find("button", {"data-side-panel-toggle": "preview"})
+        self.assertIsNotNone(toggle_button)
+        self.assertEqual("w-tooltip w-kbd", toggle_button["data-controller"])
+        self.assertEqual("mod+p", toggle_button["data-w-kbd-key-value"])
+
     def test_replace_revision(self):
         get_response = self.get()
         text_from_revision = get_response.context["form"].initial["text"]

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()
@@ -363,45 +361,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):