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

Author: vzabaznov

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php

@@ -461,4 +461,9 @@ public function getCustomOptionsUrl()
     {
         return $this->getUrl('catalog/*/customOptions');
     }
+
+    public function getCurrentProductId()
+    {
+        return $this->getProduct()->getId();
+    }
 }

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php

@@ -75,8 +75,6 @@ protected function _prepareCollection()
             null
         );
 
-        $this->_productFactory->create()->getMediaGalleryEntries();
-
         return $this;
     }
 

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml

@@ -97,7 +97,7 @@ jQuery(function ($) {
             'customOptionsUrl' => $block->getCustomOptionsUrl(),
             'isReadonly' => $block->isReadonly(),
             'itemCount' => $block->getItemCount(),
-            'currentProductId' => $block->getRequest()->getParam('id'),
+            'currentProductId' => $block->getCurrentProductId(),
         ]
     )?>);
     //adding data to templates