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

magento-engcom-team · magento-engcom-team · commit 85b698b1a934 · 2019-04-09T07:41:22.000-05:00
- Merge Pull Request #22202 from ravi-chandra3197/magento2:patch-product-review-redirect - Merged commits: 1. 594badb 2. cc5c711
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
@@ -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',
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php b/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/*/');

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,8 @@ protected function _prepareForm()`
`84`	`84`	`'review/*/save',`
`85`	`85`	`[`
`86`	`86`	`'id' => $this->getRequest()->getParam('id'),`
`87`		`- 'ret' => $this->_coreRegistry->registry('ret')`
	`87`	`+ 'ret' => $this->_coreRegistry->registry('ret'),`
	`88`	`+ 'productId' => $this->getRequest()->getParam('productId')`
`88`	`89`	`]`
`89`	`90`	`),`
`90`	`91`	`'method' => 'post',`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,10 @@ public function execute()`
`73`	`73`	`} else {`
`74`	`74`	`$resultRedirect->setPath('//');`
`75`	`75`	`}`
	`76`	`+ $productId = (int)$this->getRequest()->getParam('productId');`
	`77`	`+ if ($productId) {`
	`78`	`+ $resultRedirect->setPath("catalog/product/edit/id/$productId");`
	`79`	`+ }`
`76`	`80`	`return $resultRedirect;`
`77`	`81`	`}`
`78`	`82`	`$resultRedirect->setPath('review/*/');`