MAGETWO-50794: SampleData is not applied correctly on regression environment

duhon · duhon · commit ad6be9978e5a · 2016-03-31T15:04:28.000+03:00
- add alias table to attribute condition
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php
@@ -71,7 +71,9 @@ 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;

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,9 @@ public function getNewChildSelectOptions()`
`71`	`71`	`*/`
`72`	`72`	`public function collectValidatedAttributes($productCollection)`
`73`	`73`	`{`
	`74`	`+ $alias = array_keys($productCollection->getSelect()->getPart('from'))[0];`
`74`	`75`	`foreach ($this->getConditions() as $condition) {`
	`76`	`+ $condition->setData('attribute', $alias . '.' . $condition->getData('attribute'));`
`75`	`77`	`$condition->addToCollection($productCollection);`
`76`	`78`	`}`
`77`	`79`	`return $this;`