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

wagtail/images/views/images.py

@@ -15,6 +15,14 @@ from django.views import View
 from wagtail.admin import messages
 from wagtail.admin.auth import PermissionPolicyChecker
 from wagtail.admin.filters import BaseMediaFilterSet
+from wagtail.admin.ui.tables import (
+    BaseColumn,
+    BulkActionsCheckboxColumn,
+    Column,
+    DateColumn,
+    TitleColumn,
+    UsageCountColumn,
+)
 from wagtail.admin.utils import get_valid_next_url_from_request, set_query_params
 from wagtail.admin.views import generic
 from wagtail.images import get_image_model
@@ -23,7 +31,7 @@ from wagtail.images.forms import URLGeneratorForm, get_image_form
 from wagtail.images.models import Filter, SourceImageIOError
 from wagtail.images.permissions import permission_policy
 from wagtail.images.utils import generate_signature
-from wagtail.models import Site
+from wagtail.models import ReferenceIndex, Site
 
 permission_checker = PermissionPolicyChecker(permission_policy)
 
@@ -48,6 +56,8 @@ class IndexView(generic.IndexView):
         "-title": gettext_lazy("Title: (Z -> A)"),
         "file_size": gettext_lazy("File size: (low to high)"),
         "-file_size": gettext_lazy("File size: (high to low)"),
+        "usage_count": gettext_lazy("Usage count: (low to high)"),
+        "-usage_count": gettext_lazy("Usage count: (high to low)"),
     }
     default_ordering = "-created_at"
     context_object_name = "images"
@@ -65,7 +75,6 @@ class IndexView(generic.IndexView):
     edit_url_name = "wagtailimages:edit"
     template_name = "wagtailimages/images/index.html"
     results_template_name = "wagtailimages/images/index_results.html"
-    columns = []
 
     def get_paginate_by(self, queryset):
         return getattr(settings, "WAGTAILIMAGES_INDEX_PAGE_SIZE", 30)
@@ -82,6 +91,12 @@ class IndexView(generic.IndexView):
             .select_related("collection")
             .prefetch_renditions("max-165x165")
         )
+
+        # Annotate with usage count from the ReferenceIndex
+        images = images.annotate(
+            usage_count=ReferenceIndex.usage_count_subquery(self.model)
+        )
+
         return images
 
     @cached_property
@@ -117,11 +132,73 @@ class IndexView(generic.IndexView):
                 "current_collection": self.current_collection,
                 "current_ordering": self.ordering,
                 "ORDERING_OPTIONS": self.ORDERING_OPTIONS,
+                "layout": self.layout,
             }
         )
 
         return context
 
+    @cached_property
+    def layout(self):
+        return self.request.GET.get("layout", "grid")
+
+    @cached_property
+    def columns(self):
+        if self.layout == "grid":
+            return []
+        else:
+            columns = [
+                BulkActionsColumn("bulk_actions"),
+                ImagePreviewColumn(
+                    "preview",
+                    label=_("Preview"),
+                    accessor="image",
+                    classname="image-preview",
+                ),
+                TitleColumnWithFilename(
+                    "title",
+                    label=_("Title"),
+                    sort_key="title",
+                    get_url=self.get_edit_url,
+                    width="35%",
+                    classname="title-with-filename",
+                ),
+                Column("collection", label=_("Collection"), accessor="collection.name"),
+                DateColumn(
+                    "created_at",
+                    label=_("Created"),
+                    sort_key="created_at",
+                ),
+                UsageCountColumn(
+                    "usage_count",
+                    label=_("Usage"),
+                    sort_key="usage_count",
+                    width="16%",
+                ),
+            ]
+
+            return columns
+
+
+class BulkActionsColumn(BulkActionsCheckboxColumn):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, obj_type="image", **kwargs)
+
+    def get_header_context_data(self, parent_context):
+        context = super().get_header_context_data(parent_context)
+        parent = parent_context.get("current_collection")
+        if parent:
+            context["parent"] = parent.id
+        return context
+
+
+class ImagePreviewColumn(BaseColumn):
+    cell_template_name = "wagtailimages/images/image_preview_column_cell.html"
+
+
+class TitleColumnWithFilename(TitleColumn):
+    cell_template_name = "wagtailimages/images/title_column_cell.html"
+
 
 class EditView(generic.EditView):
     permission_policy = permission_policy

wagtail/images/views/multiple.py

@@ -16,10 +16,13 @@ from wagtail.admin.views.generic.multiple_upload import (
 from wagtail.admin.views.generic.multiple_upload import DeleteView as BaseDeleteView
 from wagtail.admin.views.generic.multiple_upload import EditView as BaseEditView
 from wagtail.images import get_image_model
-from wagtail.images.fields import get_allowed_image_extensions
 from wagtail.images.forms import get_image_form, get_image_multi_form
 from wagtail.images.permissions import ImagesPermissionPolicyGetter, permission_policy
-from wagtail.images.utils import find_image_duplicates
+from wagtail.images.utils import (
+    find_image_duplicates,
+    get_accept_attributes,
+    get_allowed_image_extensions,
+)
 
 
 class AddView(WagtailAdminTemplateMixin, BaseAddView):
@@ -104,6 +107,7 @@ class AddView(WagtailAdminTemplateMixin, BaseAddView):
                 "max_filesize": self.form.fields["file"].max_upload_size,
                 "max_title_length": self.form.fields["title"].max_length,
                 "allowed_extensions": get_allowed_image_extensions(),
+                "accept_attributes": get_accept_attributes(),
                 "error_max_file_size": self.form.fields["file"].error_messages[
                     "file_too_large_unknown_size"
                 ],

wagtail/images/widgets.py

@@ -3,10 +3,10 @@ from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 
 from wagtail.admin.staticfiles import versioned_static
+from wagtail.admin.telepath import register
 from wagtail.admin.widgets import BaseChooser, BaseChooserAdapter
 from wagtail.images import get_image_model
 from wagtail.images.shortcuts import get_rendition_or_not_found
-from wagtail.telepath import register
 
 
 class AdminImageChooser(BaseChooser):

wagtail/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: 2025-04-25 23:05+0100\n"
+"POT-Creation-Date: 2025-07-24 16:20+0200\n"
 "PO-Revision-Date: 2014-02-21 15:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Afrikaans (http://app.transifex.com/torchbox/wagtail/language/"