Merge remote-tracking branch 'goinc/MAGETWO-51956' into pr-613

Author: duhon

app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php

@@ -71,9 +71,7 @@ public function getNewChildSelectOptions()
      */
     public function collectValidatedAttributes($productCollection)
     {
-        $alias = array_keys($productCollection->getSelect()->getPart('from'))[0];
         foreach ($this->getConditions() as $condition) {
-            $condition->setData('attribute', $alias . '.' . $condition->getData('attribute'));
             $condition->addToCollection($productCollection);
         }
         return $this;

app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php

@@ -112,6 +112,13 @@ protected function _addSpecialAttributes(array &$attributes)
     public function addToCollection($collection)
     {
         $attribute = $this->getAttributeObject();
+
+        if ($collection->isEnabledFlat()) {
+            $alias = array_keys($collection->getSelect()->getPart('from'))[0];
+            $this->joinedAttributes[$attribute->getAttributeCode()] = $alias . '.' . $attribute->getAttributeCode();
+            return $this;
+        }
+
         if ('category_ids' == $attribute->getAttributeCode() || $attribute->isStatic()) {
             return $this;
         }
@@ -157,7 +164,7 @@ protected function addGlobalAttribute(
                 );
         }
 
-        $this->joinedAttributes[$attribute->getAttributeCode()] = $alias;
+        $this->joinedAttributes[$attribute->getAttributeCode()] = $alias . '.value';
 
         return $this;
     }
@@ -206,14 +213,10 @@ public function getMappedSqlField()
         $result = '';
         if ($this->getAttribute() == 'category_ids') {
             $result = parent::getMappedSqlField();
+        } elseif (isset($this->joinedAttributes[$this->getAttribute()])) {
+            $result = $this->joinedAttributes[$this->getAttribute()];
         } elseif ($this->getAttributeObject()->isStatic()) {
             $result = $this->getAttributeObject()->getAttributeCode();
-        } elseif ($this->getAttributeObject()->isScopeGlobal()) {
-            if (isset($this->joinedAttributes[$this->getAttribute()])) {
-                $result = $this->joinedAttributes[$this->getAttribute()] . '.value';
-            } else {
-                $result = parent::getMappedSqlField();
-            }
         } elseif ($this->getValueParsed()) {
             $result = 'e.entity_id';
         }

app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/CombineTest.php

@@ -72,14 +72,9 @@ public function testGetNewChildSelectOptions()
 
     public function testCollectValidatedAttributes()
     {
-        $collection = $this->getMockBuilder('\Magento\Catalog\Model\ResourceModel\Product\Collection')
-            ->disableOriginalConstructor()->setMethods(['getSelect'])
-            ->getMock();
-        $select = $this->getMockBuilder('\Magento\Framework\DB\Select')
-            ->disableOriginalConstructor()->setMethods(['getPart'])
+        $collection = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Product\Collection')
+            ->disableOriginalConstructor()
             ->getMock();
-        $select->expects($this->any())->method('getPart')->with('from')->willReturn(['alias_table' => 'table_name']);
-        $collection->expects($this->any())->method('getSelect')->willReturn($select);
         $condition = $this->getMockBuilder('Magento\CatalogWidget\Model\Rule\Condition\Combine')
             ->disableOriginalConstructor()->setMethods(['addToCollection'])
             ->getMock();