Skip to content

Commit 0f51ee5

Browse files
author
Yuri Kovsher
committed
Merge remote-tracking branch 'tango-ce/MAGETWO-31524' into MAGETWO-32571
Conflicts: app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php app/code/Magento/Cms/Controller/Index/NoCookies.php
2 parents 3f41b05 + d3751e2 commit 0f51ee5

File tree

36 files changed

+1008
-383
lines changed

36 files changed

+1008
-383
lines changed

‎app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php

100644100755
Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,33 @@ class AbstractMassDelete extends \Magento\Backend\App\Action
3737
*/
3838
protected $model = 'Magento\Framework\Model\AbstractModel';
3939

40+
/**
41+
* @var \Magento\Backend\Model\View\Result\RedirectFactory
42+
*/
43+
protected $resultRedirectFactory;
44+
45+
/**
46+
* @param \Magento\Backend\App\Action\Context $context
47+
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
48+
*/
49+
public function __construct(
50+
\Magento\Backend\App\Action\Context $context,
51+
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
52+
) {
53+
$this->resultRedirectFactory = $resultRedirectFactory;
54+
parent::__construct($context);
55+
}
56+
4057
/**
4158
* Execute action
4259
*
43-
* @return void
60+
* @return \Magento\Backend\Model\View\Result\Redirect
4461
*/
4562
public function execute()
4663
{
4764
$data = $this->getRequest()->getParam('massaction', '[]');
4865
$data = json_decode($data, true);
66+
$resultRedirect = $this->resultRedirectFactory->create();
4967

5068
try {
5169
if (isset($data['all_selected']) && $data['all_selected'] === true) {
@@ -58,13 +76,12 @@ public function execute()
5876
$this->selectedDelete($data['selected']);
5977
} else {
6078
$this->messageManager->addError(__('Please select item(s).'));
61-
$this->_redirect(static::REDIRECT_URL);
6279
}
6380
} catch (\Exception $e) {
6481
$this->messageManager->addError($e->getMessage());
6582
}
6683

67-
$this->_redirect(static::REDIRECT_URL);
84+
return $resultRedirect->setPath(static::REDIRECT_URL);
6885
}
6986

7087
/**

‎app/code/Magento/Cms/Controller/Adminhtml/Block.php

100644100755
Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,17 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
3030
}
3131

3232
/**
33-
* Init actions
33+
* Init page
3434
*
35-
* @return $this
35+
* @param \Magento\Backend\Model\View\Result\Page $resultPage
36+
* @return \Magento\Backend\Model\View\Result\Page
3637
*/
37-
protected function _initAction()
38+
protected function initPage($resultPage)
3839
{
39-
// load layout, set active menu and breadcrumbs
40-
$this->_view->loadLayout();
41-
$this->_setActiveMenu(
42-
'Magento_Cms::cms_block'
43-
)->_addBreadcrumb(
44-
__('CMS'),
45-
__('CMS')
46-
)->_addBreadcrumb(
47-
__('Static Blocks'),
48-
__('Static Blocks')
49-
);
50-
return $this;
40+
$resultPage->setActiveMenu('Magento_Cms::cms_block')
41+
->addBreadcrumb(__('CMS'), __('CMS'))
42+
->addBreadcrumb(__('Static Blocks'), __('Static Blocks'));
43+
return $resultPage;
5144
}
5245

5346
/**

‎app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php

100644100755
Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,34 @@
88

99
class Delete extends \Magento\Cms\Controller\Adminhtml\Block
1010
{
11+
/**
12+
* @var \Magento\Backend\Model\View\Result\RedirectFactory
13+
*/
14+
protected $resultRedirectFactory;
15+
16+
/**
17+
* @param \Magento\Backend\App\Action\Context $context
18+
* @param \Magento\Framework\Registry $coreRegistry
19+
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
20+
*/
21+
public function __construct(
22+
\Magento\Backend\App\Action\Context $context,
23+
\Magento\Framework\Registry $coreRegistry,
24+
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
25+
) {
26+
$this->resultRedirectFactory = $resultRedirectFactory;
27+
parent::__construct($context, $coreRegistry);
28+
}
29+
1130
/**
1231
* Delete action
1332
*
14-
* @return void
33+
* @return \Magento\Framework\Controller\ResultInterface
1534
*/
1635
public function execute()
1736
{
37+
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
38+
$resultRedirect = $this->resultRedirectFactory->create();
1839
// check if we know what should be deleted
1940
$id = $this->getRequest()->getParam('block_id');
2041
if ($id) {
@@ -26,19 +47,17 @@ public function execute()
2647
// display success message
2748
$this->messageManager->addSuccess(__('The block has been deleted.'));
2849
// go to grid
29-
$this->_redirect('*/*/');
30-
return;
50+
return $resultRedirect->setPath('*/*/');
3151
} catch (\Exception $e) {
3252
// display error message
3353
$this->messageManager->addError($e->getMessage());
3454
// go back to edit form
35-
$this->_redirect('*/*/edit', ['block_id' => $id]);
36-
return;
55+
return $resultRedirect->setPath('*/*/edit', ['block_id' => $id]);
3756
}
3857
}
3958
// display error message
4059
$this->messageManager->addError(__('We can\'t find a block to delete.'));
4160
// go to grid
42-
$this->_redirect('*/*/');
61+
return $resultRedirect->setPath('*/*/');
4362
}
4463
}

‎app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php

100644100755
Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,37 @@
88

99
class Edit extends \Magento\Cms\Controller\Adminhtml\Block
1010
{
11+
/**
12+
* @var \Magento\Backend\Model\View\Result\RedirectFactory
13+
*/
14+
protected $resultRedirectFactory;
15+
16+
/**
17+
* @var \Magento\Framework\View\Result\PageFactory
18+
*/
19+
protected $resultPageFactory;
20+
21+
/**
22+
* @param \Magento\Backend\App\Action\Context $context
23+
* @param \Magento\Framework\Registry $coreRegistry
24+
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
25+
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
26+
*/
27+
public function __construct(
28+
\Magento\Backend\App\Action\Context $context,
29+
\Magento\Framework\Registry $coreRegistry,
30+
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
31+
\Magento\Framework\View\Result\PageFactory $resultPageFactory
32+
) {
33+
$this->resultRedirectFactory = $resultRedirectFactory;
34+
$this->resultPageFactory = $resultPageFactory;
35+
parent::__construct($context, $coreRegistry);
36+
}
37+
1138
/**
1239
* Edit CMS block
1340
*
14-
* @return void
41+
* @return \Magento\Framework\Controller\ResultInterface
1542
* @SuppressWarnings(PHPMD.NPathComplexity)
1643
*/
1744
public function execute()
@@ -25,8 +52,9 @@ public function execute()
2552
$model->load($id);
2653
if (!$model->getId()) {
2754
$this->messageManager->addError(__('This block no longer exists.'));
28-
$this->_redirect('*/*/');
29-
return;
55+
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
56+
$resultRedirect = $this->resultRedirectFactory->create();
57+
return $resultRedirect->setPath('*/*/');
3058
}
3159
}
3260
// 3. Set entered data if was error when we do save
@@ -38,14 +66,16 @@ public function execute()
3866
// 4. Register model to use later in blocks
3967
$this->_coreRegistry->register('cms_block', $model);
4068

69+
/** @var \Magento\Backend\Model\View\Result\Page $resultPage */
70+
$resultPage = $this->resultPageFactory->create();
71+
4172
// 5. Build edit form
42-
$this->_initAction()->_addBreadcrumb(
73+
$this->initPage($resultPage)->addBreadcrumb(
4374
$id ? __('Edit Block') : __('New Block'),
4475
$id ? __('Edit Block') : __('New Block')
4576
);
46-
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Blocks'));
47-
$this->_view->getPage()
48-
->getConfig()->getTitle()->prepend($model->getId() ? $model->getTitle() : __('New Block'));
49-
$this->_view->renderLayout();
77+
$resultPage->getConfig()->getTitle()->prepend(__('Blocks'));
78+
$resultPage->getConfig()->getTitle()->prepend($model->getId() ? $model->getTitle() : __('New Block'));
79+
return $resultPage;
5080
}
5181
}

‎app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php

100644100755
Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,35 @@
88

99
class Index extends \Magento\Cms\Controller\Adminhtml\Block
1010
{
11+
/**
12+
* @var \Magento\Framework\View\Result\PageFactory
13+
*/
14+
protected $resultPageFactory;
15+
16+
/**
17+
* @param \Magento\Backend\App\Action\Context $context
18+
* @param \Magento\Framework\Registry $coreRegistry
19+
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
20+
*/
21+
public function __construct(
22+
\Magento\Backend\App\Action\Context $context,
23+
\Magento\Framework\Registry $coreRegistry,
24+
\Magento\Framework\View\Result\PageFactory $resultPageFactory
25+
) {
26+
$this->resultPageFactory = $resultPageFactory;
27+
parent::__construct($context, $coreRegistry);
28+
}
29+
1130
/**
1231
* Index action
1332
*
14-
* @return void
33+
* @return \Magento\Framework\Controller\ResultInterface
1534
*/
1635
public function execute()
1736
{
18-
$this->_initAction();
19-
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Blocks'));
20-
$this->_view->renderLayout();
37+
/** @var \Magento\Backend\Model\View\Result\Page $resultPage */
38+
$resultPage = $this->resultPageFactory->create();
39+
$this->initPage($resultPage)->getConfig()->getTitle()->prepend(__('Blocks'));
40+
return $resultPage;
2141
}
2242
}

‎app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php

100644100755
Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,34 @@
88

99
class NewAction extends \Magento\Cms\Controller\Adminhtml\Block
1010
{
11+
/**
12+
* @var \Magento\Backend\Model\View\Result\ForwardFactory
13+
*/
14+
protected $resultForwardFactory;
15+
16+
/**
17+
* @param \Magento\Backend\App\Action\Context $context
18+
* @param \Magento\Framework\Registry $coreRegistry
19+
* @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
20+
*/
21+
public function __construct(
22+
\Magento\Backend\App\Action\Context $context,
23+
\Magento\Framework\Registry $coreRegistry,
24+
\Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
25+
) {
26+
$this->resultForwardFactory = $resultForwardFactory;
27+
parent::__construct($context, $coreRegistry);
28+
}
29+
1130
/**
1231
* Create new CMS block
1332
*
14-
* @return void
33+
* @return \Magento\Framework\Controller\ResultInterface
1534
*/
1635
public function execute()
1736
{
18-
// the same form is used to create and edit
19-
$this->_forward('edit');
37+
/** @var \Magento\Framework\Controller\Result\Forward $resultForward */
38+
$resultForward = $this->resultForwardFactory->create();
39+
return $resultForward->forward('edit');
2040
}
2141
}

‎app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php

100644100755
Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,42 @@
88

99
class Save extends \Magento\Cms\Controller\Adminhtml\Block
1010
{
11+
/**
12+
* @var \Magento\Backend\Model\View\Result\RedirectFactory
13+
*/
14+
protected $resultRedirectFactory;
15+
16+
/**
17+
* @param \Magento\Backend\App\Action\Context $context
18+
* @param \Magento\Framework\Registry $coreRegistry
19+
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
20+
*/
21+
public function __construct(
22+
\Magento\Backend\App\Action\Context $context,
23+
\Magento\Framework\Registry $coreRegistry,
24+
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
25+
) {
26+
$this->resultRedirectFactory = $resultRedirectFactory;
27+
parent::__construct($context, $coreRegistry);
28+
}
29+
1130
/**
1231
* Save action
1332
*
14-
* @return void
33+
* @return \Magento\Framework\Controller\ResultInterface
1534
*/
1635
public function execute()
1736
{
37+
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
38+
$resultRedirect = $this->resultRedirectFactory->create();
1839
// check if data sent
1940
$data = $this->getRequest()->getPost();
2041
if ($data) {
2142
$id = $this->getRequest()->getParam('block_id');
2243
$model = $this->_objectManager->create('Magento\Cms\Model\Block')->load($id);
2344
if (!$model->getId() && $id) {
2445
$this->messageManager->addError(__('This block no longer exists.'));
25-
$this->_redirect('*/*/');
26-
return;
46+
return $resultRedirect->setPath('*/*/');
2747
}
2848

2949
// init model and set data
@@ -41,22 +61,19 @@ public function execute()
4161

4262
// check if 'Save and Continue'
4363
if ($this->getRequest()->getParam('back')) {
44-
$this->_redirect('*/*/edit', ['block_id' => $model->getId()]);
45-
return;
64+
return $resultRedirect->setPath('*/*/edit', ['block_id' => $model->getId()]);
4665
}
4766
// go to grid
48-
$this->_redirect('*/*/');
49-
return;
67+
return $resultRedirect->setPath('*/*/');
5068
} catch (\Exception $e) {
5169
// display error message
5270
$this->messageManager->addError($e->getMessage());
5371
// save data in session
5472
$this->_objectManager->get('Magento\Backend\Model\Session')->setFormData($data);
5573
// redirect to edit form
56-
$this->_redirect('*/*/edit', ['block_id' => $this->getRequest()->getParam('block_id')]);
57-
return;
74+
return $resultRedirect->setPath('*/*/edit', ['block_id' => $this->getRequest()->getParam('block_id')]);
5875
}
5976
}
60-
$this->_redirect('*/*/');
77+
return $resultRedirect->setPath('*/*/');
6178
}
6279
}

0 commit comments

Comments
 (0)