Skip to content

Commit 82e41d1

Browse files
author
Alex Paliarush
committed
MAGETWO-69015: Cannot login as admin user with limited user role
1 parent d9a9eb4 commit 82e41d1

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

app/code/Magento/Store/Model/Config/Processor/Fallback.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@ class Fallback implements PostProcessorInterface
5959

6060
/**
6161
* Fallback constructor.
62+
*
6263
* @param Scopes $scopes
64+
* @param ResourceConnection $resourceConnection
65+
* @param Store $storeResource
66+
* @param Website $websiteResource
67+
* @param DeploymentConfig $deploymentConfig
6368
*/
6469
public function __construct(
6570
Scopes $scopes,

app/code/Magento/Store/Model/ResourceModel/Website.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
*/
1616
class Website extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1717
{
18-
/**
19-
* @var array
20-
*/
21-
private $websitesCache;
22-
2318
/**
2419
* Define main table
2520
*

lib/internal/Magento/Framework/App/Config/InitialConfigSource.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ public function __construct(Reader $reader, $configType, $fileKey = null)
4949
public function get($path = '')
5050
{
5151
$data = new DataObject($this->reader->load());
52-
return $data->getData($this->configType) ?: [];
52+
if ($path !== '' && $path !== null) {
53+
$path = '/' . $path;
54+
}
55+
return $data->getData($this->configType . $path) ?: [];
5356
}
5457
}

lib/internal/Magento/Framework/App/Test/Unit/Config/InitialConfigSourceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ public function testGet()
4141
$this->reader->expects($this->once())
4242
->method('load')
4343
->willReturn([$this->configType => [$path => 'value']]);
44-
$this->assertEquals([$path => 'value'], $this->source->get());
44+
$this->assertEquals('value', $this->source->get($path));
4545
}
4646
}

0 commit comments

Comments
 (0)