Skip to content

Commit 61a9a5e

Browse files
MAGETWO-83270: 11700: "Something Went Wrong" error for limited access admin user magento#11993
2 parents c9f38fa + 4904b3d commit 61a9a5e

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,10 @@ private function validateAclResource($dataProviderConfigData)
127127
{
128128
if (isset($dataProviderConfigData['aclResource'])) {
129129
if (!$this->_authorization->isAllowed($dataProviderConfigData['aclResource'])) {
130-
$this->_redirect('admin/denied');
130+
if (!$this->_request->isAjax()) {
131+
$this->_redirect('admin/denied');
132+
}
133+
131134
return false;
132135
}
133136
}

app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,13 @@ public function testExecuteAjaxRequestWithoutPermissions(array $dataProviderConf
279279
$this->requestMock->expects($this->any())
280280
->method('getParams')
281281
->willReturn([]);
282+
if ($isAllowed === false) {
283+
$this->requestMock->expects($this->once())
284+
->method('isAjax')
285+
->willReturn(true);
286+
}
287+
$this->responseMock->expects($this->never())
288+
->method('setRedirect');
282289
$this->responseMock->expects($this->any())
283290
->method('appendBody')
284291
->with($renderedData);

0 commit comments

Comments
 (0)