From af2d29a16e8b7bc30a872d9e20914bdae5b24111 Mon Sep 17 00:00:00 2001 From: Sunil Patel Date: Sat, 10 Oct 2020 07:29:20 +0000 Subject: [PATCH 1/5] magento/magento2#30388 : fix js error on edit review page --- .../Magento/Review/Block/Adminhtml/Edit.php | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php index c85374edb8d98..15110f4f89cad 100644 --- a/app/code/Magento/Review/Block/Adminhtml/Edit.php +++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Review\Block\Adminhtml; /** @@ -44,7 +45,8 @@ public function __construct( \Magento\Review\Helper\Action\Pager $reviewActionPager, \Magento\Framework\Registry $registry, array $data = [] - ) { + ) + { $this->_coreRegistry = $registry; $this->_reviewActionPager = $reviewActionPager; $this->_reviewFactory = $reviewFactory; @@ -78,12 +80,12 @@ protected function _construct() [ 'label' => __('Previous'), 'onclick' => 'setLocation(\'' . $this->getUrl( - 'review/*/*', - [ - 'id' => $prevId, - 'ret' => $this->getRequest()->getParam('ret'), - ] - ) . '\')' + 'review/*/*', + [ + 'id' => $prevId, + 'ret' => $this->getRequest()->getParam('ret'), + ] + ) . '\')' ], 3, 10 @@ -139,12 +141,12 @@ protected function _construct() [ 'label' => __('Next'), 'onclick' => 'setLocation(\'' . $this->getUrl( - 'review/*/*', - [ - 'id' => $nextId, - 'ret' => $this->getRequest()->getParam('ret'), - ] - ) . '\')' + 'review/*/*', + [ + 'id' => $nextId, + 'ret' => $this->getRequest()->getParam('ret'), + ] + ) . '\')' ], 3, 105 @@ -220,10 +222,13 @@ protected function _construct() ); } } - Event.observe(window, \'load\', function(){ - Event.observe($("select_stores"), \'change\', review.updateRating); - }); '; + if (!$this->_storeManager->hasSingleStore()) { + $this->_formInitScripts[] = 'Event.observe(window, \'load\', function(){ + Event.observe($("select_stores"), \'change\', review.updateRating); + }); + '; + } } /** From e08499bd5083956ac807c4bd93354714bc9005f7 Mon Sep 17 00:00:00 2001 From: Sunil Patel Date: Sat, 10 Oct 2020 07:40:39 +0000 Subject: [PATCH 2/5] magento/magento2#30388 : fix js error on edit review page --- .../Magento/Review/Block/Adminhtml/Edit.php | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php index 15110f4f89cad..c5667af20c82c 100644 --- a/app/code/Magento/Review/Block/Adminhtml/Edit.php +++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php @@ -3,7 +3,6 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ - namespace Magento\Review\Block\Adminhtml; /** @@ -45,8 +44,7 @@ public function __construct( \Magento\Review\Helper\Action\Pager $reviewActionPager, \Magento\Framework\Registry $registry, array $data = [] - ) - { + ) { $this->_coreRegistry = $registry; $this->_reviewActionPager = $reviewActionPager; $this->_reviewFactory = $reviewFactory; @@ -80,12 +78,12 @@ protected function _construct() [ 'label' => __('Previous'), 'onclick' => 'setLocation(\'' . $this->getUrl( - 'review/*/*', - [ - 'id' => $prevId, - 'ret' => $this->getRequest()->getParam('ret'), - ] - ) . '\')' + 'review/*/*', + [ + 'id' => $prevId, + 'ret' => $this->getRequest()->getParam('ret'), + ] + ) . '\')' ], 3, 10 @@ -141,12 +139,12 @@ protected function _construct() [ 'label' => __('Next'), 'onclick' => 'setLocation(\'' . $this->getUrl( - 'review/*/*', - [ - 'id' => $nextId, - 'ret' => $this->getRequest()->getParam('ret'), - ] - ) . '\')' + 'review/*/*', + [ + 'id' => $nextId, + 'ret' => $this->getRequest()->getParam('ret'), + ] + ) . '\')' ], 3, 105 From a4be3e0e51eae4f8d9ebc4c8b9c833ef656aa779 Mon Sep 17 00:00:00 2001 From: Sunil Patel Date: Sat, 10 Oct 2020 09:48:23 +0000 Subject: [PATCH 3/5] magento/magento2#30347 : fix js error on delete bundle options --- .../view/adminhtml/web/js/components/bundle-dynamic-rows.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js index e9b05182b855d..7f07750812497 100644 --- a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js +++ b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js @@ -72,7 +72,7 @@ define([ */ removeBundleItemsFromOption: function (index) { var bundleSelections = registry.get(this.name + '.' + index + '.' + this.bundleSelectionsName), - bundleSelectionsLength = (bundleSelections.elems() || []).length, + bundleSelectionsLength = bundleSelections ? (bundleSelections.elems() || []).length:[], i; if (bundleSelectionsLength) { From a88f5808e69a3823645988cb0a6e3f91fc682272 Mon Sep 17 00:00:00 2001 From: Sunil Patel Date: Sat, 10 Oct 2020 09:52:49 +0000 Subject: [PATCH 4/5] Revert "magento/magento2#30347 : fix js error on delete bundle options" This reverts commit a4be3e0e51eae4f8d9ebc4c8b9c833ef656aa779. --- .../view/adminhtml/web/js/components/bundle-dynamic-rows.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js index 7f07750812497..e9b05182b855d 100644 --- a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js +++ b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js @@ -72,7 +72,7 @@ define([ */ removeBundleItemsFromOption: function (index) { var bundleSelections = registry.get(this.name + '.' + index + '.' + this.bundleSelectionsName), - bundleSelectionsLength = bundleSelections ? (bundleSelections.elems() || []).length:[], + bundleSelectionsLength = (bundleSelections.elems() || []).length, i; if (bundleSelectionsLength) { From 7ea472187a74f57588ea5945646cadd356e9da95 Mon Sep 17 00:00:00 2001 From: Sunil Patel Date: Sat, 10 Oct 2020 10:58:30 +0000 Subject: [PATCH 5/5] magento/magento2#30388 : fix js error on edit review page --- app/code/Magento/Review/Block/Adminhtml/Edit.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php index c5667af20c82c..9162d293f9332 100644 --- a/app/code/Magento/Review/Block/Adminhtml/Edit.php +++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php @@ -222,9 +222,12 @@ protected function _construct() } '; if (!$this->_storeManager->hasSingleStore()) { - $this->_formInitScripts[] = 'Event.observe(window, \'load\', function(){ - Event.observe($("select_stores"), \'change\', review.updateRating); - }); + $this->_formInitScripts[] = ' + require(["jquery","prototype"], function(jQuery){ + Event.observe(window, \'load\', function(){ + Event.observe($("select_stores"), \'change\', review.updateRating); + }); + }) '; } }