From 79cd029e80ef1d729c578c9cb0e783e0f7f88640 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 5 Jul 2022 13:49:21 +0100 Subject: [PATCH] Use data-chooser-modal-search-filter on collection filter mixin So that document and image choosers don't have to identify it by ID in their JS --- client/src/entrypoints/documents/document-chooser-modal.js | 1 - client/src/entrypoints/images/image-chooser-modal.js | 1 - wagtail/admin/forms/choosers.py | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/client/src/entrypoints/documents/document-chooser-modal.js b/client/src/entrypoints/documents/document-chooser-modal.js index ff3d0e4172..3c4f2e3d1b 100644 --- a/client/src/entrypoints/documents/document-chooser-modal.js +++ b/client/src/entrypoints/documents/document-chooser-modal.js @@ -19,7 +19,6 @@ class DocumentChooserModalOnloadHandlerFactory extends ChooserModalOnloadHandler window.DOCUMENT_CHOOSER_MODAL_ONLOAD_HANDLERS = new DocumentChooserModalOnloadHandlerFactory({ - searchFilterSelectors: ['#id_collection_id'], searchInputDelay: 50, creationFormFileFieldSelector: '#id_document-chooser-upload-file', creationFormTitleFieldSelector: '#id_document-chooser-upload-title', diff --git a/client/src/entrypoints/images/image-chooser-modal.js b/client/src/entrypoints/images/image-chooser-modal.js index ec6f6221fc..738c2254c2 100644 --- a/client/src/entrypoints/images/image-chooser-modal.js +++ b/client/src/entrypoints/images/image-chooser-modal.js @@ -92,7 +92,6 @@ class ImageChooserModalOnloadHandlerFactory extends ChooserModalOnloadHandlerFac window.IMAGE_CHOOSER_MODAL_ONLOAD_HANDLERS = new ImageChooserModalOnloadHandlerFactory({ - searchFilterSelectors: ['#id_collection_id'], creationFormFileFieldSelector: '#id_image-chooser-upload-file', creationFormTitleFieldSelector: '#id_image-chooser-upload-title', creationFormEventName: 'wagtail:images-upload', diff --git a/wagtail/admin/forms/choosers.py b/wagtail/admin/forms/choosers.py index 6a2d1b4297..7b98126992 100644 --- a/wagtail/admin/forms/choosers.py +++ b/wagtail/admin/forms/choosers.py @@ -75,4 +75,5 @@ class CollectionFilterMixin(forms.Form): label=_("Collection"), choices=collection_choices, required=False, + widget=forms.Select(attrs={"data-chooser-modal-search-filter": True}), )