Skip to content

Commit 62638a3

Browse files
author
Oleksandr Gorkun
committed
MAGETWO-92196: [Backport for 2.1.x] Mass Action Wrong Requests
1 parent 7acadb5 commit 62638a3

File tree

6 files changed

+48
-810
lines changed

6 files changed

+48
-810
lines changed

app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
*/
66
namespace Magento\Sales\Controller\Adminhtml\Order;
77

8+
use Magento\Framework\Exception\NotFoundException;
89
use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
910
use Magento\Backend\App\Action\Context;
1011
use Magento\Ui\Component\MassAction\Filter;
1112
use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
13+
use Magento\Framework\App\Request\Http as HttpRequest;
1214

1315
class MassCancel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
1416
{
@@ -30,6 +32,20 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
3032
$this->collectionFactory = $collectionFactory;
3133
}
3234

35+
/**
36+
* @inheritDoc
37+
*/
38+
public function execute()
39+
{
40+
/** @var HttpRequest $request */
41+
$request = $this->getRequest();
42+
if (!$request->isPost()) {
43+
throw new NotFoundException(__('Page not found.'));
44+
}
45+
46+
return parent::execute();
47+
}
48+
3349
/**
3450
* Cancel selected orders
3551
*

app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
*/
66
namespace Magento\Sales\Controller\Adminhtml\Order;
77

8+
use Magento\Framework\Exception\NotFoundException;
89
use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
910
use Magento\Backend\App\Action\Context;
1011
use Magento\Ui\Component\MassAction\Filter;
1112
use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
1213
use Magento\Sales\Api\OrderManagementInterface;
14+
use Magento\Framework\App\Request\Http as HttpRequest;
1315

1416
/**
1517
* Class MassHold
@@ -45,6 +47,20 @@ public function __construct(
4547
$this->orderManagement = $orderManagement;
4648
}
4749

50+
/**
51+
* @inheritDoc
52+
*/
53+
public function execute()
54+
{
55+
/** @var HttpRequest $request */
56+
$request = $this->getRequest();
57+
if (!$request->isPost()) {
58+
throw new NotFoundException(__('Page not found.'));
59+
}
60+
61+
return parent::execute();
62+
}
63+
4864
/**
4965
* Hold selected orders
5066
*

app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
*/
66
namespace Magento\Sales\Controller\Adminhtml\Order;
77

8+
use Magento\Framework\Exception\NotFoundException;
89
use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
910
use Magento\Backend\App\Action\Context;
1011
use Magento\Ui\Component\MassAction\Filter;
1112
use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
13+
use Magento\Framework\App\Request\Http as HttpRequest;
1214

1315
class MassUnhold extends AbstractMassAction
1416
{
@@ -30,6 +32,20 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
3032
$this->collectionFactory = $collectionFactory;
3133
}
3234

35+
/**
36+
* @inheritDoc
37+
*/
38+
public function execute()
39+
{
40+
/** @var HttpRequest $request */
41+
$request = $this->getRequest();
42+
if (!$request->isPost()) {
43+
throw new NotFoundException(__('Page not found.'));
44+
}
45+
46+
return parent::execute();
47+
}
48+
3349
/**
3450
* Unhold selected orders
3551
*

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php

Lines changed: 0 additions & 292 deletions
This file was deleted.

0 commit comments

Comments
 (0)