diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml index 6934d263535b59bde9a0a6c72ead01ec3dc0e0c0..6775549e39d49d9b1d097c99861a8683b164ab1f 100644 --- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml +++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml @@ -85,6 +85,14 @@ <item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.bookmarks</item> <item name="namespace" xsi:type="string">current.filters</item> </item> + <item name="templates" xsi:type="array"> + <item name="filters" xsi:type="array"> + <item name="select" xsi:type="array"> + <item name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</item> + <item name="template" xsi:type="string">ui/grid/filters/elements/ui-select</item> + </item> + </item> + </item> <item name="childDefaults" xsi:type="array"> <item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.listing_filters</item> <item name="imports" xsi:type="array"> diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml index c55c919be2164d32927ef1dce7d2933fcfb178da..27cc3ddc2e019535e117e1ba519a48c7264ee7cd 100644 --- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml +++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml @@ -86,6 +86,14 @@ <item name="provider" xsi:type="string">cms_page_listing.cms_page_listing.listing_top.bookmarks</item> <item name="namespace" xsi:type="string">current.filters</item> </item> + <item name="templates" xsi:type="array"> + <item name="filters" xsi:type="array"> + <item name="select" xsi:type="array"> + <item name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</item> + <item name="template" xsi:type="string">ui/grid/filters/elements/ui-select</item> + </item> + </item> + </item> <item name="childDefaults" xsi:type="array"> <item name="provider" xsi:type="string">cms_page_listing.cms_page_listing.listing_top.listing_filters</item> <item name="imports" xsi:type="array"> diff --git a/app/code/Magento/Ui/Component/Filters.php b/app/code/Magento/Ui/Component/Filters.php index dadcdc2f09535bb7b8275eedea8f52f8dfc1b55f..3859f777f3e46d52b8799d4af5c9bc297bf75228 100644 --- a/app/code/Magento/Ui/Component/Filters.php +++ b/app/code/Magento/Ui/Component/Filters.php @@ -73,6 +73,11 @@ class Filters extends AbstractComponent implements ObserverInterface { if ($component instanceof ColumnInterface) { $filterType = $component->getData('config/filter'); + + if (is_array($filterType)) { + $filterType = $filterType['filterType']; + } + if (!$filterType) { return; } diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js index 5547e3ad9dba80b8a4573e5ea08c6fc2107e710a..6fe8c40c4d8094513fa55070f6173e36cea5345d 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js @@ -57,19 +57,6 @@ define([ } }, - /** - * Extends instance with defaults, extends config with formatted values - * and options, and invokes initialize method of AbstractElement class. - * - * @returns {Object} Chainable - */ - initialize: function () { - this._super() - .initOptions(); - - return this; - }, - /** * Parses options and merges the result with instance *