Skip to content

Commit ce917b4

Browse files
author
Yurii Torbyk
committed
Merge remote-tracking branch 'origin/MAGETWO-35527' into MAGETWO-26762
2 parents 1b6f6e6 + 7d5fec5 commit ce917b4

File tree

41 files changed

+77
-76
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+77
-76
lines changed

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ public function execute()
2222
$this->_eventManager->dispatch('clean_catalog_images_cache_after');
2323
$this->messageManager->addSuccess(__('The image cache was cleaned.'));
2424

25-
return $this->getDefaultRedirect();
25+
return $this->getDefaultResult();
2626
}
2727

2828
/**
2929
* {@inheritdoc}
3030
*
3131
* @return \Magento\Backend\Model\View\Result\Redirect
3232
*/
33-
public function getDefaultRedirect()
33+
public function getDefaultResult()
3434
{
3535
$resultRedirect = $this->resultRedirectFactory->create();
3636
return $resultRedirect->setPath('adminhtml/*');

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ public function execute()
2222
$this->_eventManager->dispatch('clean_media_cache_after');
2323
$this->messageManager->addSuccess(__('The JavaScript/CSS cache has been cleaned.'));
2424

25-
return $this->getDefaultRedirect();
25+
return $this->getDefaultResult();
2626
}
2727

2828
/**
2929
* {@inheritdoc}
3030
*
3131
* @return \Magento\Backend\Model\View\Result\Redirect
3232
*/
33-
public function getDefaultRedirect()
33+
public function getDefaultResult()
3434
{
3535
$resultRedirect = $this->resultRedirectFactory->create();
3636
return $resultRedirect->setPath('adminhtml/*');

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ public function execute()
3636
$this->messageManager->addSuccess(__("%1 cache type(s) disabled.", $updatedTypes));
3737
}
3838

39-
return $this->getDefaultRedirect();
39+
return $this->getDefaultResult();
4040
}
4141

4242
/**
4343
* {@inheritdoc}
4444
*
4545
* @return \Magento\Backend\Model\View\Result\Redirect
4646
*/
47-
public function getDefaultRedirect()
47+
public function getDefaultResult()
4848
{
4949
$resultRedirect = $this->resultRedirectFactory->create();
5050
return $resultRedirect->setPath('adminhtml/*');

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ public function execute()
3535
$this->messageManager->addSuccess(__("%1 cache type(s) enabled.", $updatedTypes));
3636
}
3737

38-
return $this->getDefaultRedirect();
38+
return $this->getDefaultResult();
3939
}
4040

4141
/**
4242
* {@inheritdoc}
4343
*
4444
* @return \Magento\Backend\Model\View\Result\Redirect
4545
*/
46-
public function getDefaultRedirect()
46+
public function getDefaultResult()
4747
{
4848
$resultRedirect = $this->resultRedirectFactory->create();
4949
return $resultRedirect->setPath('adminhtml/*');

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
*/
77
namespace Magento\Backend\Controller\Adminhtml\Cache;
88

9-
use Magento\Framework\Exception\LocalizedException;
10-
119
class MassRefresh extends \Magento\Backend\Controller\Adminhtml\Cache
1210
{
1311
/**
@@ -33,15 +31,15 @@ public function execute()
3331
$this->messageManager->addSuccess(__("%1 cache type(s) refreshed.", $updatedTypes));
3432
}
3533

36-
return $this->getDefaultRedirect();
34+
return $this->getDefaultResult();
3735
}
3836

3937
/**
4038
* {@inheritdoc}
4139
*
4240
* @return \Magento\Backend\Model\View\Result\Redirect
4341
*/
44-
public function getDefaultRedirect()
42+
public function getDefaultResult()
4543
{
4644
$resultRedirect = $this->resultRedirectFactory->create();
4745
return $resultRedirect->setPath('adminhtml/*');

‎app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ public function execute()
3636
}
3737
$this->messageManager->addSuccess(__('We updated lifetime statistic.'));
3838

39-
return $this->getDefaultRedirect();
39+
return $this->getDefaultResult();
4040
}
4141

4242
/**
4343
* {@inheritdoc}
4444
*
4545
* @return \Magento\Backend\Model\View\Result\Redirect
4646
*/
47-
public function getDefaultRedirect()
47+
public function getDefaultResult()
4848
{
4949
$resultRedirect = $this->resultRedirectFactory->create();
5050
return $resultRedirect->setPath('*/*');

‎app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ public function execute()
6464
}
6565
}
6666

67-
return $this->getDefaultRedirect();
67+
return $this->getDefaultResult();
6868
}
6969

7070
/**
7171
* {@inheritdoc}
7272
*
7373
* @return \Magento\Backend\Model\View\Result\Redirect
7474
*/
75-
public function getDefaultRedirect()
75+
public function getDefaultResult()
7676
{
7777
$resultRedirect = $this->resultRedirectFactory->create();
7878
return $resultRedirect->setPath('*/*');

‎app/code/Magento/Backend/Model/View/Result/Redirect.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function __construct(
4949
*/
5050
public function setRefererOrBaseUrl()
5151
{
52-
$this->url = $this->redirect->getRedirectUrl($this->urlBuilder->getUrl('adminhtml/index'));
52+
$this->url = $this->redirect->getRedirectUrl($this->urlBuilder->getUrl($this->urlBuilder->getStartupPageUrl()));
5353
return $this;
5454
}
5555

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ public function execute()
6767
$this->messageManager->addSuccess(__('A total of %1 record(s) have been updated.', count($productIds)));
6868
$this->_productPriceIndexerProcessor->reindexList($productIds);
6969

70-
return $this->getDefaultRedirect();
70+
return $this->getDefaultResult();
7171
}
7272

7373
/**
7474
* {@inheritdoc}
7575
*
7676
* @return \Magento\Backend\Model\View\Result\Redirect
7777
*/
78-
public function getDefaultRedirect()
78+
public function getDefaultResult()
7979
{
8080
$resultRedirect = $this->resultRedirectFactory->create();
8181
return $resultRedirect->setPath(

‎app/code/Magento/Catalog/Controller/Product/Compare/Clear.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ public function execute()
3030
$this->messageManager->addSuccess(__('You cleared the comparison list.'));
3131
$this->_objectManager->get('Magento\Catalog\Helper\Product\Compare')->calculate();
3232

33-
return $this->getDefaultRedirect();
33+
return $this->getDefaultResult();
3434
}
3535
}

0 commit comments

Comments
 (0)