🔃 [EngCom] Public Pull Requests - 2.1-develop

magento-engcom-team · web-flow · commit dac90d5a1d6f · 2018-04-11T12:20:08.000+03:00
Accepted Public Pull Requests: - #14596: Specify the table when adding field to filter (by @PierreLeMaguer) Fixed GitHub Issues: - #14572: Specify the table when adding field to filter for the collection Eav/Model/ResourceModel/Entity/Attribute/Option/Collection.php (reported by @PierreLeMaguer) has been fixed in #14596 by @PierreLeMaguer in 2.1-develop branch Related commits: 1. f02dae8
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option/Collection.php
@@ -78,7 +78,7 @@ protected function _construct()
      */
     public function setAttributeFilter($setId)
     {
-        return $this->addFieldToFilter('attribute_id', $setId);
+        return $this->addFieldToFilter('main_table.attribute_id', $setId);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ protected function _construct()`
`78`	`78`	`*/`
`79`	`79`	`public function setAttributeFilter($setId)`
`80`	`80`	`{`
`81`		`- return $this->addFieldToFilter('attribute_id', $setId);`
	`81`	`+ return $this->addFieldToFilter('main_table.attribute_id', $setId);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`/**`