From dbabe3dd62b7417794295a3cd5a93b598cb9a177 Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@ebay.com>
Date: Tue, 20 Oct 2015 16:33:57 +0300
Subject: [PATCH] MAGETWO-44109: Import Custom Options grid contains
Downloadable product if Import Custom Options for Simple product
---
.../Block/Adminhtml/Product/Edit/Tab/Options/Option.php | 5 +++++
.../Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php | 2 --
.../templates/catalog/product/edit/options/option.phtml | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
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
index f507d9ee30e..3b1b57e3535 100644
--- 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
@@ -461,4 +461,9 @@ class Option extends Widget
{
return $this->getUrl('catalog/*/customOptions');
}
+
+ public function getCurrentProductId()
+ {
+ return $this->getProduct()->getId();
+ }
}
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
index e7aeff7affa..d98abfd533f 100644
--- 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
@@ -75,8 +75,6 @@ class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
null
);
- $this->_productFactory->create()->getMediaGalleryEntries();
-
return $this;
}
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
index f0baae3a2bd..778c8657a83 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
+++ b/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
--
GitLab