Skip to content

Commit e18caf4

Browse files
OlgaVasyltsunOlgaVasyltsun
committed
MAGETWO-62680: Restricted Admin User mustn't see info from other store
1 parent ea6f29c commit e18caf4

File tree

7 files changed

+216
-36
lines changed

7 files changed

+216
-36
lines changed

‎app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/Collection.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Model\ResourceModel\Order\Creditmemo\Grid;
8+
9+
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
10+
use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
11+
use Magento\Framework\Event\ManagerInterface as EventManager;
12+
use Psr\Log\LoggerInterface as Logger;
13+
14+
class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
15+
{
16+
/**
17+
* Initialize dependencies.
18+
*
19+
* @param EntityFactory $entityFactory
20+
* @param Logger $logger
21+
* @param FetchStrategy $fetchStrategy
22+
* @param EventManager $eventManager
23+
* @param string $mainTable
24+
* @param string $resourceModel
25+
*/
26+
public function __construct(
27+
EntityFactory $entityFactory,
28+
Logger $logger,
29+
FetchStrategy $fetchStrategy,
30+
EventManager $eventManager,
31+
$mainTable = 'sales_creditmemo_grid',
32+
$resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Creditmemo'
33+
) {
34+
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
35+
}
36+
}

‎app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Order/Grid/Collection.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Model\ResourceModel\Order\Creditmemo\Order\Grid;
8+
9+
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
10+
use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
11+
use Magento\Framework\Event\ManagerInterface as EventManager;
12+
use Psr\Log\LoggerInterface as Logger;
13+
14+
class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
15+
{
16+
/**
17+
* Initialize dependencies.
18+
*
19+
* @param EntityFactory $entityFactory
20+
* @param Logger $logger
21+
* @param FetchStrategy $fetchStrategy
22+
* @param EventManager $eventManager
23+
* @param string $mainTable
24+
* @param string $resourceModel
25+
*/
26+
public function __construct(
27+
EntityFactory $entityFactory,
28+
Logger $logger,
29+
FetchStrategy $fetchStrategy,
30+
EventManager $eventManager,
31+
$mainTable = 'sales_creditmemo_grid',
32+
$resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Creditmemo'
33+
) {
34+
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
35+
}
36+
}

‎app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Model\ResourceModel\Order\Invoice\Grid;
8+
9+
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
10+
use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
11+
use Magento\Framework\Event\ManagerInterface as EventManager;
12+
use Psr\Log\LoggerInterface as Logger;
13+
14+
class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
15+
{
16+
/**
17+
* Initialize dependencies.
18+
*
19+
* @param EntityFactory $entityFactory
20+
* @param Logger $logger
21+
* @param FetchStrategy $fetchStrategy
22+
* @param EventManager $eventManager
23+
* @param string $mainTable
24+
* @param string $resourceModel
25+
*/
26+
public function __construct(
27+
EntityFactory $entityFactory,
28+
Logger $logger,
29+
FetchStrategy $fetchStrategy,
30+
EventManager $eventManager,
31+
$mainTable = 'sales_invoice_grid',
32+
$resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Invoice'
33+
) {
34+
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
35+
}
36+
}

‎app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Orders/Grid/Collection.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Model\ResourceModel\Order\Invoice\Orders\Grid;
8+
9+
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
10+
use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
11+
use Magento\Framework\Event\ManagerInterface as EventManager;
12+
use Psr\Log\LoggerInterface as Logger;
13+
14+
class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
15+
{
16+
/**
17+
* Initialize dependencies.
18+
*
19+
* @param EntityFactory $entityFactory
20+
* @param Logger $logger
21+
* @param FetchStrategy $fetchStrategy
22+
* @param EventManager $eventManager
23+
* @param string $mainTable
24+
* @param string $resourceModel
25+
*/
26+
public function __construct(
27+
EntityFactory $entityFactory,
28+
Logger $logger,
29+
FetchStrategy $fetchStrategy,
30+
EventManager $eventManager,
31+
$mainTable = 'sales_invoice_grid',
32+
$resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Invoice'
33+
) {
34+
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
35+
}
36+
}

‎app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Grid/Collection.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Model\ResourceModel\Order\Shipment\Grid;
8+
9+
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
10+
use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
11+
use Magento\Framework\Event\ManagerInterface as EventManager;
12+
use Psr\Log\LoggerInterface as Logger;
13+
14+
class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
15+
{
16+
/**
17+
* Initialize dependencies.
18+
*
19+
* @param EntityFactory $entityFactory
20+
* @param Logger $logger
21+
* @param FetchStrategy $fetchStrategy
22+
* @param EventManager $eventManager
23+
* @param string $mainTable
24+
* @param string $resourceModel
25+
*/
26+
public function __construct(
27+
EntityFactory $entityFactory,
28+
Logger $logger,
29+
FetchStrategy $fetchStrategy,
30+
EventManager $eventManager,
31+
$mainTable = 'sales_shipment_grid',
32+
$resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Shipment'
33+
) {
34+
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
35+
}
36+
}

‎app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Order/Grid/Collection.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Model\ResourceModel\Order\Shipment\Order\Grid;
8+
9+
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
10+
use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
11+
use Magento\Framework\Event\ManagerInterface as EventManager;
12+
use Psr\Log\LoggerInterface as Logger;
13+
14+
class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
15+
{
16+
/**
17+
* Initialize dependencies.
18+
*
19+
* @param EntityFactory $entityFactory
20+
* @param Logger $logger
21+
* @param FetchStrategy $fetchStrategy
22+
* @param EventManager $eventManager
23+
* @param string $mainTable
24+
* @param string $resourceModel
25+
*/
26+
public function __construct(
27+
EntityFactory $entityFactory,
28+
Logger $logger,
29+
FetchStrategy $fetchStrategy,
30+
EventManager $eventManager,
31+
$mainTable = 'sales_shipment_grid',
32+
$resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Shipment'
33+
) {
34+
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
35+
}
36+
}

‎app/code/Magento/Sales/etc/di.xml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -811,42 +811,6 @@
811811
<argument name="state" xsi:type="object">Magento\Framework\App\State\Proxy</argument>
812812
</arguments>
813813
</type>
814-
<virtualType name="Magento\Sales\Model\ResourceModel\Order\Invoice\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
815-
<arguments>
816-
<argument name="mainTable" xsi:type="string">sales_invoice_grid</argument>
817-
<argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order\Invoice</argument>
818-
</arguments>
819-
</virtualType>
820-
<virtualType name="Magento\Sales\Model\ResourceModel\Order\Shipment\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
821-
<arguments>
822-
<argument name="mainTable" xsi:type="string">sales_shipment_grid</argument>
823-
<argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order\Shipment</argument>
824-
</arguments>
825-
</virtualType>
826-
<virtualType name="Magento\Sales\Model\ResourceModel\Order\Creditmemo\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
827-
<arguments>
828-
<argument name="mainTable" xsi:type="string">sales_creditmemo_grid</argument>
829-
<argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order\Creditmemo</argument>
830-
</arguments>
831-
</virtualType>
832-
<virtualType name="Magento\Sales\Model\ResourceModel\Order\Invoice\Orders\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
833-
<arguments>
834-
<argument name="mainTable" xsi:type="string">sales_invoice_grid</argument>
835-
<argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order\Invoice</argument>
836-
</arguments>
837-
</virtualType>
838-
<virtualType name="Magento\Sales\Model\ResourceModel\Order\Shipment\Order\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
839-
<arguments>
840-
<argument name="mainTable" xsi:type="string">sales_shipment_grid</argument>
841-
<argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order\Shipment</argument>
842-
</arguments>
843-
</virtualType>
844-
<virtualType name="Magento\Sales\Model\ResourceModel\Order\Creditmemo\Order\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
845-
<arguments>
846-
<argument name="mainTable" xsi:type="string">sales_creditmemo_grid</argument>
847-
<argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order\Creditmemo</argument>
848-
</arguments>
849-
</virtualType>
850814
<virtualType name="orderMetadata" type="Magento\Sales\Model\ResourceModel\Metadata">
851815
<arguments>
852816
<argument name="resourceClassName" xsi:type="string">Magento\Sales\Model\ResourceModel\Order</argument>

0 commit comments

Comments
 (0)