MAGETWO-44109: Import Custom Options grid contains Downloadable product if Import Custom Options for Simple product

vzabaznov · vzabaznov · commit d857d569a01c · 2015-10-21T15:16:50.000+03:00
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
@@ -65,7 +65,8 @@ protected function _prepareCollection()
 
         if (null !== $this->getRequest()->getParam('current_product_id')) {
             $this->getCollection()->getSelect()->where(
-                'e.entity_id != ?', $this->getRequest()->getParam('current_product_id')
+                'e.entity_id != ?',
+                $this->getRequest()->getParam('current_product_id')
             );
         }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ protected function _prepareCollection()`
`65`	`65`
`66`	`66`	`if (null !== $this->getRequest()->getParam('current_product_id')) {`
`67`	`67`	`$this->getCollection()->getSelect()->where(`
`68`		`- 'e.entity_id != ?', $this->getRequest()->getParam('current_product_id')`
	`68`	`+ 'e.entity_id != ?',`
	`69`	`+ $this->getRequest()->getParam('current_product_id')`
`69`	`70`	`);`
`70`	`71`	`}`
`71`	`72`