wagtail 7.0.2__py3-none-any.whl → 7.1__py3-none-any.whl

wagtail/documents/locale/ug/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-07-24 16:20+0200\n"
 "PO-Revision-Date: 2014-02-20 21:06+0000\n"
 "Last-Translator: Abduqadir Abliz <sahranbay@gmail.com>, 2024\n"
 "Language-Team: Uyghur (http://app.transifex.com/torchbox/wagtail/language/"
@@ -126,12 +126,6 @@ msgid_plural "Are you sure you want to delete these documents?"
 msgstr[0] "بۇ پۈتۈكنى راستتىنلا ئۆچۈرەمسىز؟"
 msgstr[1] "بۇ پۈتۈكنى راستتىنلا ئۆچۈرەمسىز؟"
 
-#, python-format
-msgid "Used %(usage_count)s time"
-msgid_plural "Used %(usage_count)s times"
-msgstr[0] "%(usage_count)s قېتىم ئىشلىتىلدى"
-msgstr[1] "%(usage_count)s قېتىم ئىشلىتىلدى"
-
 msgid "You don't have permission to delete this document"
 msgid_plural "You don't have permission to delete these documents"
 msgstr[0] "بۇ  پۈتۈكنى ئۆچۈرۈش ئىجازىتىڭىز يوق"
@@ -156,13 +150,6 @@ msgstr "سىز بۇ توپلامغا ھېچقانداق پۈتۈك يۈكلىم
 msgid "You haven't uploaded any documents."
 msgstr "سىز ھېچقانداق پۈتۈك يۈكلىمىدىڭىز."
 
-msgid ""
-"Why not <a class=\"upload-one-now\" href=\"#tab-upload\" data-tab-"
-"trigger>upload one now</a>?"
-msgstr ""
-"نېمىشقا <a class=\"upload-one-now\" href=\"#tab-upload\" data-tab-"
-"trigger>ھازىر بىرنى يۈكلە</a>مەيسىز؟"
-
 msgid "Change document:"
 msgstr "پۈتۈك ئۆزگەرت:"
 
@@ -184,6 +171,12 @@ msgstr "ھۆججەت تېپىلمىدى"
 msgid "Usage"
 msgstr "ئىشلىتىلىشى"
 
+#, python-format
+msgid "Used %(usage_count)s time"
+msgid_plural "Used %(usage_count)s times"
+msgstr[0] "%(usage_count)s قېتىم ئىشلىتىلدى"
+msgstr[1] "%(usage_count)s قېتىم ئىشلىتىلدى"
+
 msgid "Select all documents in listing"
 msgstr "تىزىمدىكى ھەممە پۈتۈكنى تاللايدۇ"
 

wagtail/documents/locale/uk/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-07-24 16:20+0200\n"
 "PO-Revision-Date: 2014-02-20 21:06+0000\n"
 "Last-Translator: d55ee35323c0c760f088259cd23b1b6d_9e8a7d1 "
 "<5459f3ae99ecdd5ed0be0220acd46004_1019581>, 2021\n"
@@ -124,14 +124,6 @@ msgstr[1] "Ви впевнені, що хочете видалити ці док
 msgstr[2] "Ви впевнені, що хочете видалити ці документи?"
 msgstr[3] "Ви впевнені, що хочете видалити ці документи?"
 
-#, python-format
-msgid "Used %(usage_count)s time"
-msgid_plural "Used %(usage_count)s times"
-msgstr[0] "Використано %(usage_count)s раз"
-msgstr[1] "Викорнистано %(usage_count)s рази"
-msgstr[2] "Використано %(usage_count)s разів"
-msgstr[3] "Використано %(usage_count)s разів"
-
 msgid "You don't have permission to delete this document"
 msgid_plural "You don't have permission to delete these documents"
 msgstr[0] "Вам не дозволено видаляти цей документ"
@@ -154,13 +146,6 @@ msgstr "Ви не завантажили жодних документів до
 msgid "You haven't uploaded any documents."
 msgstr "Ви не завантажили жодних документів."
 
-msgid ""
-"Why not <a class=\"upload-one-now\" href=\"#tab-upload\" data-tab-"
-"trigger>upload one now</a>?"
-msgstr ""
-"Чому б не <a class=\"upload-one-now\" href=\"#tab-upload\" data-tab-"
-"trigger>завантажити якесь зараз</a>?"
-
 msgid "Change document:"
 msgstr "Змінити документ:"
 
@@ -182,6 +167,14 @@ msgstr "Файл не знайдено"
 msgid "Usage"
 msgstr "Використання"
 
+#, python-format
+msgid "Used %(usage_count)s time"
+msgid_plural "Used %(usage_count)s times"
+msgstr[0] "Використано %(usage_count)s раз"
+msgstr[1] "Викорнистано %(usage_count)s рази"
+msgstr[2] "Використано %(usage_count)s разів"
+msgstr[3] "Використано %(usage_count)s разів"
+
 msgid "Select all documents in listing"
 msgstr "Обрати всі документи у списку"
 

wagtail/documents/locale/vi/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-07-24 16:20+0200\n"
 "PO-Revision-Date: 2014-02-20 21:06+0000\n"
 "Last-Translator: Vu Pham, 2021\n"
 "Language-Team: Vietnamese (http://app.transifex.com/torchbox/wagtail/"
@@ -70,11 +70,6 @@ msgstr "Không thêm"
 msgid "Delete documents"
 msgstr "Xóa văn bản"
 
-#, python-format
-msgid "Used %(usage_count)s time"
-msgid_plural "Used %(usage_count)s times"
-msgstr[0] "Dùng %(usage_count)s lần"
-
 msgid "Yes, delete"
 msgstr "Đúng, xoá đi"
 
@@ -90,6 +85,11 @@ msgstr "Đang đăng tải..."
 msgid "Upload"
 msgstr "Đăng tải"
 
+#, python-format
+msgid "Used %(usage_count)s time"
+msgid_plural "Used %(usage_count)s times"
+msgstr[0] "Dùng %(usage_count)s lần"
+
 msgid "Tag"
 msgstr "Thẻ"
 

wagtail/documents/locale/zh/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-07-24 16:20+0200\n"
 "PO-Revision-Date: 2014-02-20 21:06+0000\n"
 "Last-Translator: shengsheng gz <gzshengsheng@139.com>, 2018\n"
 "Language-Team: Chinese (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/documents/locale/zh_Hans/LC_MESSAGES/django.po

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-07-24 16:20+0200\n"
 "PO-Revision-Date: 2014-02-20 21:06+0000\n"
 "Last-Translator: 祝沙军 <zhushajun@gmail.com>, 2017\n"
 "Language-Team: Chinese (China) (http://app.transifex.com/torchbox/wagtail/"
@@ -131,11 +131,6 @@ msgid "Are you sure you want to delete this document?"
 msgid_plural "Are you sure you want to delete these documents?"
 msgstr[0] "你确定要删除这些文档吗？"
 
-#, python-format
-msgid "Used %(usage_count)s time"
-msgid_plural "Used %(usage_count)s times"
-msgstr[0] "已使用%(usage_count)s次"
-
 msgid "You don't have permission to delete this document"
 msgid_plural "You don't have permission to delete these documents"
 msgstr[0] "您没有删除这些文档的权限"
@@ -155,13 +150,6 @@ msgstr "你还没有上传任何文档到这个集合。"
 msgid "You haven't uploaded any documents."
 msgstr "你还没有上传任何文档。"
 
-msgid ""
-"Why not <a class=\"upload-one-now\" href=\"#tab-upload\" data-tab-"
-"trigger>upload one now</a>?"
-msgstr ""
-"为什么不 <a class=\"upload-one-now\" href=\"#tab-upload\" data-tab-trigger>立"
-"刻上传一个</a>呢?"
-
 msgid "Change document:"
 msgstr "修改文档："
 
@@ -183,6 +171,11 @@ msgstr "未找到文件"
 msgid "Usage"
 msgstr "使用情况"
 
+#, python-format
+msgid "Used %(usage_count)s time"
+msgid_plural "Used %(usage_count)s times"
+msgstr[0] "已使用%(usage_count)s次"
+
 msgid "Select all documents in listing"
 msgstr "选择列表中的所有文档"
 

wagtail/documents/locale/zh_Hant/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-07-24 16:20+0200\n"
 "PO-Revision-Date: 2014-02-20 21:06+0000\n"
 "Last-Translator: Yeh Yen-Ke <yyken@outlook.com>, 2019\n"
 "Language-Team: Chinese Traditional (http://app.transifex.com/torchbox/"
@@ -70,11 +70,6 @@ msgstr "將選擇的文件加入至集合"
 msgid "Delete documents"
 msgstr "刪除文件"
 
-#, python-format
-msgid "Used %(usage_count)s time"
-msgid_plural "Used %(usage_count)s times"
-msgstr[0] "已使用%(usage_count)s次"
-
 msgid "Yes, delete"
 msgstr "是，刪除"
 
@@ -111,6 +106,11 @@ msgstr "未找到文件"
 msgid "Usage"
 msgstr "使用情況"
 
+#, python-format
+msgid "Used %(usage_count)s time"
+msgid_plural "Used %(usage_count)s times"
+msgstr[0] "已使用%(usage_count)s次"
+
 #, python-format
 msgid "Sorry, no documents match \"<em>%(query_string)s</em>\""
 msgstr "對不起。沒找到符合\"<em>%(query_string)s</em>\"的文件"

wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html

@@ -13,19 +13,22 @@
 
 {% block items_with_access %}
     {% if items %}
-        <p>
-            {% blocktrans trimmed count counter=items|length %}
-                Are you sure you want to delete this document?
-            {% plural %}
-                Are you sure you want to delete these documents?
-            {% endblocktrans %}
-        </p>
+        {% if not is_protected %}
+            <p>
+                {% blocktrans trimmed count counter=items|length %}
+                    Are you sure you want to delete this document?
+                {% plural %}
+                    Are you sure you want to delete these documents?
+                {% endblocktrans %}
+            </p>
+        {% endif %}
         <ul>
             {% for document in items %}
                 {% with usage_count_val=document.item.get_usage.count %}
                     <li>
                         <a href="{% url 'wagtaildocs:edit' document.item.id %}" target="_blank" rel="noreferrer">{{document.item.title}}</a>
-                        (<a href="{{ document.item.usage_url }}">{% blocktrans trimmed with usage_count=usage_count_val|intcomma count usage_count_val=usage_count_val %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}</a>)
+
+                        {% include "wagtailadmin/shared/usage_summary.html" with model_opts=model_opts usage_url=document.usage_url usage_count=document.usage_count is_protected=document.is_protected %}
                     </li>
                 {% endwith %}
             {% endfor %}
@@ -41,7 +44,7 @@
 {% endblock items_with_no_access %}
 
 {% block form_section %}
-    {% if items %}
+    {% if items and not is_protected %}
         {% trans 'Yes, delete' as action_button_text %}
         {% trans "No, don't delete" as no_action_button_text %}
         {% include 'wagtailadmin/bulk_actions/confirmation/form.html' with action_button_class="serious" %}

wagtail/documents/templates/wagtaildocs/chooser/results.html

@@ -16,7 +16,7 @@
         {% endif %}
         {% if can_create %}
             {% blocktrans trimmed %}
-                Why not <a class="upload-one-now" href="#tab-upload" data-tab-trigger>upload one now</a>?
+                Why not <a class="upload-one-now" href="#tab-upload" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger" data-w-tabs-focus-param="true">upload one now</a>?
             {% endblocktrans %}
         {% endif %}
     </p>

wagtail/documents/templates/wagtaildocs/multiple/add.html

@@ -49,7 +49,7 @@
     </div>
 
     <div id="overall-progress" class="progress progress-secondary">
-        <div class="bar" style="width: 0%;">0%</div>
+        <div class="bar w-w-0">0%</div>
     </div>
 
     <ul id="upload-list" class="upload-list multiple"></ul>
@@ -59,7 +59,7 @@
             <div class="left col3">
                 <div class="preview">
                     <div class="progress">
-                        <div class="bar" style="width: 0%;"></div>
+                        <div class="bar w-w-0"></div>
                     </div>
                 </div>
             </div>

wagtail/documents/tests/test_admin_views.py

@@ -2118,6 +2118,32 @@ class TestUsageCount(WagtailTestUtils, TestCase):
         response = self.client.get(reverse("wagtaildocs:edit", args=(1,)))
         self.assertContains(response, "Used 0 times")
 
+    def test_usage_count_column_with_document_usage(self):
+        with self.captureOnCommitCallbacks(execute=True):
+            doc = models.Document.objects.get(id=1)
+            page = EventPage.objects.get(id=4)
+            event_page_related_link = EventPageRelatedLink()
+            event_page_related_link.page = page
+            event_page_related_link.link_document = doc
+            event_page_related_link.save()
+
+        response = self.client.get(reverse("wagtaildocs:index"), {"layout": "list"})
+        self.assertEqual(response.status_code, 200)
+
+        self.assertContains(response, "Used 1 time")
+
+        expected_url = "/admin/documents/usage/1/"
+        self.assertContains(response, expected_url)
+
+    def test_usage_count_column_no_document_usage(self):
+        response = self.client.get(reverse("wagtaildocs:index"), {"layout": "list"})
+        self.assertEqual(response.status_code, 200)
+
+        self.assertContains(response, "Used 0 times")
+
+        expected_url = "/admin/documents/usage/1/"
+        self.assertContains(response, expected_url)
+
 
 class TestGetUsage(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
     fixtures = ["test.json"]

wagtail/documents/tests/test_bulk_actions/test_bulk_add_to_collection.py

@@ -1,4 +1,4 @@
-from django.contrib.auth.models import Permission
+from django.contrib.auth.models import Group, Permission
 from django.test import TestCase
 from django.urls import reverse
 
@@ -82,3 +82,87 @@ class TestBulkAddDocumentsToCollection(WagtailTestUtils, TestCase):
                 Document.objects.get(id=document.id).collection_id,
                 self.dest_collection.id,
             )
+
+
+class TestBulkAddAllDocumentsToCollection(WagtailTestUtils, TestCase):
+    def setUp(self):
+        self.user = self.login()
+        self.root_collection = Collection.get_first_root_node()
+        self.dest_collection = self.root_collection.add_child(name="Destination")
+        self.documents = [
+            Document.objects.create(title=f"Test document - {i}") for i in range(1, 6)
+        ]
+        self.url = (
+            reverse(
+                "wagtail_bulk_action",
+                args=(
+                    "wagtaildocs",
+                    "document",
+                    "add_to_collection",
+                ),
+            )
+            + "?id=all"
+        )
+        self.post_data = {"collection": str(self.dest_collection.id)}
+
+    def test_add_all_to_collection_with_limited_permissions(self):
+        # Create a group with document permissions on the source collection only
+        self.other_collection = self.root_collection.add_child(name="Other")
+
+        group = Group.objects.create(name="Other Collection Editors")
+        self.other_collection.group_permissions.create(
+            group=group, permission=Permission.objects.get(codename="change_document")
+        )
+
+        self.user.is_superuser = False
+        self.user.groups.add(group)
+        self.user.user_permissions.add(
+            Permission.objects.get(
+                content_type__app_label="wagtailadmin", codename="access_admin"
+            )
+        )
+        self.user.save()
+
+        # The user needs to have access to at least one document in order to access the bulk action page
+        other_document = Document.objects.create(
+            title="Test document - other", collection=self.other_collection
+        )
+
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, 200)
+
+        html = response.content.decode()
+
+        self.assertInHTML(other_document.title, html)
+        for document in self.documents:
+            self.assertNotInHTML(f"<li>{document.title}</li>", html)
+
+        self.client.post(self.url, self.post_data)
+
+        # Documents should not be moved to new collection
+        for document in self.documents:
+            self.assertEqual(
+                Document.objects.get(id=document.id).collection_id,
+                self.root_collection.id,
+            )
+
+    def test_simple(self):
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(
+            response, "wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html"
+        )
+
+    def test_add_all_to_collection(self):
+        # Make post request
+        response = self.client.post(self.url, self.post_data)
+
+        # User should be redirected back to the index
+        self.assertEqual(response.status_code, 302)
+
+        # Documents should be moved to new collection
+        for document in self.documents:
+            self.assertEqual(
+                Document.objects.get(id=document.id).collection_id,
+                self.dest_collection.id,
+            )

wagtail/documents/tests/test_bulk_actions/test_bulk_delete.py

@@ -1,34 +1,33 @@
 from django.contrib.auth.models import Permission
 from django.test import TestCase
 from django.urls import reverse
+from django.utils.http import urlencode
 
 from wagtail.documents import get_document_model
+from wagtail.test.testapp.models import VariousOnDeleteModel
 from wagtail.test.utils import WagtailTestUtils
 
 Document = get_document_model()
 
 
 class TestDocumentBulkDeleteView(WagtailTestUtils, TestCase):
-    def setUp(self):
-        self.user = self.login()
-
-        # Create documents to delete
-        self.documents = [
+    @classmethod
+    def setUpTestData(cls):
+        cls.documents = [
             Document.objects.create(title=f"Test document - {i}") for i in range(1, 6)
         ]
-        self.url = (
-            reverse(
-                "wagtail_bulk_action",
-                args=(
-                    "wagtaildocs",
-                    "document",
-                    "delete",
-                ),
-            )
-            + "?"
+        cls.url = reverse(
+            "wagtail_bulk_action",
+            args=(Document._meta.app_label, Document._meta.model_name, "delete"),
         )
-        for document in self.documents:
-            self.url += f"id={document.id}&"
+        cls.query_params = {
+            "next": reverse("wagtaildocs:index"),
+            "id": [item.pk for item in cls.documents],
+        }
+        cls.url += "?" + urlencode(cls.query_params, doseq=True)
+
+    def setUp(self):
+        self.user = self.login()
 
     def test_delete_with_limited_permissions(self):
         self.user.is_superuser = False
@@ -85,4 +84,52 @@ class TestDocumentBulkDeleteView(WagtailTestUtils, TestCase):
         for document in self.documents:
             self.assertContains(response, document.usage_url)
         # usage count should be printed for each document
-        self.assertContains(response, "Used 0 times", count=5)
+        self.assertContains(response, "This document is referenced 0 times.", count=5)
+
+    def test_delete_get_with_protected_reference(self):
+        protected = self.documents[0]
+        with self.captureOnCommitCallbacks(execute=True):
+            VariousOnDeleteModel.objects.create(
+                text="Undeletable",
+                protected_document=protected,
+            )
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, 200)
+        soup = self.get_soup(response.content)
+        main = soup.select_one("main")
+        usage_link = main.find(
+            "a",
+            href=reverse("wagtaildocs:document_usage", args=[protected.pk])
+            + "?describe_on_delete=1",
+        )
+        self.assertIsNotNone(usage_link)
+        self.assertEqual(usage_link.text.strip(), "This document is referenced 1 time.")
+        self.assertContains(
+            response,
+            "One or more references to this document prevent it from being deleted.",
+        )
+        submit_button = main.select_one("form button[type=submit]")
+        self.assertIsNone(submit_button)
+        back_button = main.find("a", href=reverse("wagtaildocs:index"))
+        self.assertIsNotNone(back_button)
+        self.assertEqual(back_button.text.strip(), "Go back")
+
+    def test_delete_post_with_protected_reference(self):
+        protected = self.documents[0]
+        with self.captureOnCommitCallbacks(execute=True):
+            VariousOnDeleteModel.objects.create(
+                text="Undeletable",
+                protected_document=protected,
+            )
+        response = self.client.post(self.url)
+
+        # Should throw a PermissionDenied error and redirect to the dashboard
+        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse("wagtailadmin_home"))
+        self.assertEqual(
+            response.context["message"],
+            "Sorry, you do not have permission to access this area.",
+        )
+
+        # Check that the document is still here
+        self.assertTrue(Document.objects.filter(pk=protected.pk).exists())

wagtail/documents/views/bulk_actions/delete.py

@@ -1,10 +1,11 @@
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
 
+from wagtail.admin.views.bulk_action.mixins import ReferenceIndexMixin
 from wagtail.documents.views.bulk_actions.document_bulk_action import DocumentBulkAction
 
 
-class DeleteBulkAction(DocumentBulkAction):
+class DeleteBulkAction(ReferenceIndexMixin, DocumentBulkAction):
     display_name = _("Delete")
     action_type = "delete"
     aria_label = _("Delete selected documents")
@@ -25,6 +26,9 @@ class DeleteBulkAction(DocumentBulkAction):
         ).delete()
         return num_parent_objects, 0
 
+    def get_usage_url(self, item):
+        return item.usage_url + "?describe_on_delete=1"
+
     def get_success_message(self, num_parent_objects, num_child_objects):
         return ngettext(
             "%(num_parent_objects)d document has been deleted",

wagtail/documents/views/bulk_actions/document_bulk_action.py

@@ -10,7 +10,9 @@ class DocumentBulkAction(BulkAction):
     models = [get_document_model()]
 
     def get_all_objects_in_listing_query(self, parent_id):
-        listing_objects = self.model.objects.all()
+        listing_objects = self.permission_policy.instances_user_has_permission_for(
+            self.request.user, "change"
+        )
         if parent_id is not None:
             listing_objects = listing_objects.filter(collection_id=parent_id)
 

wagtail/documents/views/documents.py

@@ -18,12 +18,14 @@ from wagtail.admin.ui.tables import (
     DownloadColumn,
     Table,
     TitleColumn,
+    UsageCountColumn,
 )
 from wagtail.admin.utils import get_valid_next_url_from_request, set_query_params
 from wagtail.admin.views import generic
 from wagtail.documents import get_document_model
 from wagtail.documents.forms import get_document_form
 from wagtail.documents.permissions import permission_policy
+from wagtail.models import ReferenceIndex
 
 permission_checker = PermissionPolicyChecker(permission_policy)
 Document = get_document_model()
@@ -79,10 +81,17 @@ class IndexView(generic.IndexView):
 
     def get_base_queryset(self):
         # Get documents (filtered by user permission)
-        return self.permission_policy.instances_user_has_any_permission_for(
+        documents = self.permission_policy.instances_user_has_any_permission_for(
             self.request.user, ["change", "delete"]
         ).select_related("collection")
 
+        # Annotate with usage count from the ReferenceIndex
+        documents = documents.annotate(
+            usage_count=ReferenceIndex.usage_count_subquery(self.model)
+        )
+
+        return documents
+
     @cached_property
     def current_collection(self):
         # Upon validation, the cleaned data is a Collection instance
@@ -104,7 +113,12 @@ class IndexView(generic.IndexView):
                 "created_at",
                 label=_("Created"),
                 sort_key="created_at",
+            ),
+            UsageCountColumn(
+                "usage_count",
+                label=_("Usage"),
                 width="16%",
+                sort_key="usage_count",
             ),
         ]
         if self.filters and "collection_id" in self.filters.filters:

wagtail/embeds/blocks.py

@@ -30,15 +30,16 @@ class EmbedValue:
 
 class EmbedBlock(blocks.URLBlock):
     def get_default(self):
+        default = self._evaluate_callable(self.meta.default)
         # Allow specifying the default for an EmbedBlock as either an EmbedValue or a string (or None).
-        if not self.meta.default:
+        if not default:
             return None
-        elif isinstance(self.meta.default, EmbedValue):
-            return self.meta.default
+        elif isinstance(default, EmbedValue):
+            return default
         else:
             # assume default has been passed as a string
             return EmbedValue(
-                self.meta.default,
+                default,
                 getattr(self.meta, "max_width", None),
                 getattr(self.meta, "max_height", None),
             )

wagtail/embeds/embeds.py

@@ -20,7 +20,10 @@ def get_finder_for_embed(url, max_width=None, max_height=None):
     raise EmbedUnsupportedProviderException
 
 
-def get_embed(url, max_width=None, max_height=None, finder=get_finder_for_embed):
+def get_embed(url, max_width=None, max_height=None):
+    """
+    Retrieve an embed for the given URL using the configured finders.
+    """
     embed_hash = get_embed_hash(url, max_width, max_height)
 
     # Check database
@@ -29,7 +32,7 @@ def get_embed(url, max_width=None, max_height=None, finder=get_finder_for_embed)
     except Embed.DoesNotExist:
         pass
 
-    embed_dict = finder(url, max_width, max_height)
+    embed_dict = get_finder_for_embed(url, max_width, max_height)
 
     # Make sure width and height are valid integers before inserting into database
     try: