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

vzabaznov · vzabaznov · commit 35bbb0a79b24 · 2015-10-20T16:44:54.000+03:00
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -462,6 +462,11 @@ public function getCustomOptionsUrl()
         return $this->getUrl('catalog/*/customOptions');
     }
 
+    /**
+     * Return current product id
+     *
+     * @return null|int
+     */
     public function getCurrentProductId()
     {
         return $this->getProduct()->getId();

Original file line number	Diff line number	Diff line change
`@@ -462,6 +462,11 @@ public function getCustomOptionsUrl()`
`462`	`462`	`return $this->getUrl('catalog/*/customOptions');`
`463`	`463`	`}`
`464`	`464`
	`465`	`+ /**`
	`466`	`+ * Return current product id`
	`467`	`+ *`
	`468`	`+ * @return null\|int`
	`469`	`+ */`
`465`	`470`	`public function getCurrentProductId()`
`466`	`471`	`{`
`467`	`472`	`return $this->getProduct()->getId();`