ENGCOM-4822: [Backport] wrong url redirect when edit product review from product view page #22430

Author: VladimirZaets

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

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+
 /**
  * Adminhtml Review Edit Form
  */
@@ -69,23 +70,32 @@ public function __construct(
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function _prepareForm()
     {
         $review = $this->_coreRegistry->registry('review_data');
         $product = $this->_productFactory->create()->load($review->getEntityPkValue());
 
+        $formActionParams =[
+            'id' => $this->getRequest()->getParam('id'),
+            'ret' => $this->_coreRegistry->registry('ret')
+        ];
+        if ($this->getRequest()->getParam('productId')) {
+            $formActionParams['productId'] = $this->getRequest()->getParam('productId');
+        }
+        if ($this->getRequest()->getParam('customerId')) {
+            $formActionParams['customerId'] = $this->getRequest()->getParam('customerId');
+        }
+
         /** @var \Magento\Framework\Data\Form $form */
         $form = $this->_formFactory->create(
             [
                 'data' => [
                     'id' => 'edit_form',
                     'action' => $this->getUrl(
                         'review/*/save',
-                        [
-                            'id' => $this->getRequest()->getParam('id'),
-                            'ret' => $this->_coreRegistry->registry('ret')
-                        ]
+                        $formActionParams
                     ),
                     'method' => 'post',
                 ],

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

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