From 8847346ae2c91957446feeebfc0a2dda4c3b6de7 Mon Sep 17 00:00:00 2001
From: Volodymyr Zaets <vzaets@ebay.com>
Date: Fri, 23 Oct 2015 18:22:42 +0300
Subject: [PATCH] MAGETWO-44521: Multi-check is absent in Admin data grid
filters
- Add ui-select to cms page filters
---
.../adminhtml/ui_component/cms_page_listing.xml | 8 ++++++++
app/code/Magento/Ui/Component/Filters.php | 5 +++++
.../Ui/view/base/web/js/form/element/ui-select.js | 13 -------------
3 files changed, 13 insertions(+), 13 deletions(-)
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 c55c919be21..27cc3ddc2e0 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 dadcdc2f095..3859f777f3e 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 5547e3ad9db..6fe8c40c4d8 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
*
--
GitLab