ENGCOM-4719: Fixed wrong url redirect when edit product review from product view page #22202

Author: sivaschenko

app/code/Magento/Review/Block/Adminhtml/Edit/Form.php

@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Review\Block\Adminhtml\Edit;
+
 /**
  * Adminhtml Review Edit Form
  */
-namespace Magento\Review\Block\Adminhtml\Edit;
-
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
@@ -84,7 +84,8 @@ protected function _prepareForm()
                         'review/*/save',
                         [
                             'id' => $this->getRequest()->getParam('id'),
-                            'ret' => $this->_coreRegistry->registry('ret')
+                            'ret' => $this->_coreRegistry->registry('ret'),
+                            'productId' => $this->getRequest()->getParam('productId')
                         ]
                     ),
                     'method' => 'post',

app/code/Magento/Review/Controller/Adminhtml/Product/Save.php

@@ -73,6 +73,10 @@ public function execute()
             } else {
                 $resultRedirect->setPath('*/*/');
             }
+            $productId = (int)$this->getRequest()->getParam('productId');
+            if ($productId) {
+                $resultRedirect->setPath("catalog/product/edit/id/$productId");
+            }
             return $resultRedirect;
         }
         $resultRedirect->setPath('review/*/');