Merge remote-tracking branch 'main/develop' into MAGETWO-32996

magento · Jul 9, 2015 · f5b0c4a · f5b0c4a
2 parents a183a3c + 4fd68c3
commit f5b0c4a
Show file tree

Hide file tree

Showing 136 changed files with 8,072 additions and 2,151 deletions.
diff --git a/app/code/Magento/Cms/Model/Block/DataProvider.php b/app/code/Magento/Cms/Model/Block/DataProvider.php
@@ -8,6 +8,7 @@
 use Magento\Cms\Model\Resource\Block\Collection;
 use Magento\Cms\Model\Resource\Block\CollectionFactory;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
+use Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool;
 
 /**
  * Class DataProvider
@@ -48,11 +49,17 @@ class DataProvider implements DataProviderInterface
      */
     protected $data = [];
 
+    /**
+     * @var FilterPool
+     */
+    protected $filterPool;
+
     /**
      * @param string $name
      * @param string $primaryFieldName
      * @param string $requestFieldName
      * @param CollectionFactory $collectionFactory
+     * @param FilterPool $filterPool
      * @param array $meta
      * @param array $data
      */
@@ -61,13 +68,15 @@ public function __construct(
         $primaryFieldName,
         $requestFieldName,
         CollectionFactory $collectionFactory,
+        FilterPool $filterPool,
         array $meta = [],
         array $data = []
     ) {
         $this->name = $name;
         $this->primaryFieldName = $primaryFieldName;
         $this->requestFieldName = $requestFieldName;
         $this->collection = $collectionFactory->create();
+        $this->filterPool = $filterPool;
         $this->meta = $meta;
         $this->data = $data;
     }
@@ -145,9 +154,9 @@ public function getFieldMetaInfo($fieldSetName, $fieldName)
     /**
      * @inheritdoc
      */
-    public function addFilter($field, $condition = null)
+    public function addFilter($condition, $field = null, $type = 'regular')
     {
-        $this->collection->addFieldToFilter($field, $condition);
+        $this->filterPool->registerNewFilter($condition, $field, $type);
     }
 
     /**
@@ -216,6 +225,7 @@ public function removeAllFields()
      */
     public function getData()
     {
+        $this->filterPool->applyFilters($this->collection);
         return $this->collection->toArray();
     }
 
@@ -226,6 +236,7 @@ public function getData()
      */
     public function count()
     {
+        $this->filterPool->applyFilters($this->collection);
         return $this->collection->count();
     }
 

diff --git a/app/code/Magento/Cms/Model/Page/DataProvider.php b/app/code/Magento/Cms/Model/Page/DataProvider.php
@@ -8,6 +8,7 @@
 use Magento\Cms\Model\Resource\Page\Collection;
 use Magento\Cms\Model\Resource\Page\CollectionFactory;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
+use Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool;
 
 /**
  * Class DataProvider
@@ -57,11 +58,17 @@ class DataProvider implements DataProviderInterface
      */
     protected $data = [];
 
+    /**
+     * @var FilterPool
+     */
+    protected $filterPool;
+
     /**
      * @param string $name
      * @param string $primaryFieldName
      * @param string $requestFieldName
      * @param CollectionFactory $collectionFactory
+     * @param FilterPool $filterPool
      * @param array $meta
      * @param array $data
      */
@@ -70,13 +77,14 @@ public function __construct(
         $primaryFieldName,
         $requestFieldName,
         CollectionFactory $collectionFactory,
+        FilterPool $filterPool,
         array $meta = [],
         array $data = []
     ) {
         $this->name = $name;
         $this->primaryFieldName = $primaryFieldName;
         $this->requestFieldName = $requestFieldName;
-
+        $this->filterPool = $filterPool;
         $this->collection = $collectionFactory->create();
         $this->collection->setFirstStoreFlag(true);
         $this->meta = $meta;
@@ -156,9 +164,9 @@ public function getFieldMetaInfo($fieldSetName, $fieldName)
     /**
      * @inheritdoc
      */
-    public function addFilter($field, $condition = null)
+    public function addFilter($condition, $field = null, $type = 'regular')
     {
-        $this->collection->addFieldToFilter($field, $condition);
+        $this->filterPool->registerNewFilter($condition, $field, $type);
     }
 
     /**
@@ -227,6 +235,7 @@ public function removeAllFields()
      */
     public function getData()
     {
+        $this->filterPool->applyFilters($this->collection);
         return $this->collection->toArray();
     }
 
@@ -237,6 +246,7 @@ public function getData()
      */
     public function count()
     {
+        $this->filterPool->applyFilters($this->collection);
         return $this->collection->count();
     }
 

diff --git a/app/code/Magento/Cms/Setup/UpgradeSchema.php b/app/code/Magento/Cms/Setup/UpgradeSchema.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cms\Setup;
+
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * @codeCoverageIgnore
+ */
+class UpgradeSchema implements UpgradeSchemaInterface
+{
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $installer = $setup;
+        $connection = $installer->getConnection();
+        if (version_compare($context->getVersion(), '2.0.1') < 0) {
+            $connection->addIndex(
+                $installer->getTable('cms_page'),
+                $setup->getIdxName(
+                    $installer->getTable('cms_page'),
+                    ['title', 'meta_keywords', 'meta_description', 'identifier', 'content'],
+                    AdapterInterface::INDEX_TYPE_FULLTEXT
+                ),
+                ['title', 'meta_keywords', 'meta_description', 'identifier', 'content'],
+                AdapterInterface::INDEX_TYPE_FULLTEXT
+            );
+            $connection->addIndex(
+                $installer->getTable('cms_block'),
+                $setup->getIdxName(
+                    $installer->getTable('cms_block'),
+                    ['title', 'identifier', 'content'],
+                    AdapterInterface::INDEX_TYPE_FULLTEXT
+                ),
+                ['title', 'identifier', 'content'],
+                AdapterInterface::INDEX_TYPE_FULLTEXT
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/Cms/Ui/DataProvider/Block/Row/Actions.php b/app/code/Magento/Cms/Ui/DataProvider/Block/Row/Actions.php
diff --git a/app/code/Magento/Cms/Ui/DataProvider/Page/Row/Actions.php b/app/code/Magento/Cms/Ui/DataProvider/Page/Row/Actions.php
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
@@ -56,4 +56,24 @@
             </argument>
         </arguments>
     </type>
+    <virtualType name="CmsGirdFilterPool" type="Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool">
+        <arguments>
+            <argument name="appliers" xsi:type="array">
+                <item name="regular" xsi:type="object">Magento\Framework\View\Element\UiComponent\DataProvider\RegularFilter</item>
+                <item name="fulltext" xsi:type="object">Magento\Framework\View\Element\UiComponent\DataProvider\FulltextFilter</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="PageGridDataProvider" type="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider">
+        <arguments>
+            <argument name="collection" xsi:type="object" shared="false">Magento\Cms\Model\Resource\Page\Collection</argument>
+            <argument name="filterPool" xsi:type="object" shared="false">CmsGirdFilterPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="BlockGridDataProvider" type="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider">
+        <arguments>
+            <argument name="collection" xsi:type="object" shared="false">Magento\Cms\Model\Resource\Block\Collection</argument>
+            <argument name="filterPool" xsi:type="object" shared="false">CmsGirdFilterPool</argument>
+        </arguments>
+    </virtualType>
 </config>
diff --git a/app/code/Magento/Cms/etc/module.xml b/app/code/Magento/Cms/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Magento_Cms" setup_version="2.0.0">
+    <module name="Magento_Cms" setup_version="2.0.1">
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Theme"/>

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
@@ -23,7 +23,7 @@
     </argument>
     <dataSource name="cms_block_listing_data_source">
         <argument name="dataProvider" xsi:type="configurableObject">
-            <argument name="class" xsi:type="string">Magento\Cms\Model\Block\DataProvider</argument>
+            <argument name="class" xsi:type="string">BlockGridDataProvider</argument>
             <argument name="name" xsi:type="string">cms_block_listing_data_source</argument>
             <argument name="primaryFieldName" xsi:type="string">block_id</argument>
             <argument name="requestFieldName" xsi:type="string">id</argument>
@@ -69,7 +69,7 @@
                 </item>
             </argument>
         </container>
-        <container name="search">
+        <filterSearch name="fulltext">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="component" xsi:type="string">Magento_Ui/js/grid/search/search</item>
@@ -82,7 +82,7 @@
                     </item>
                 </item>
             </argument>
-        </container>
+        </filterSearch>
         <filters name="listing_filters">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">