cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' into main

feature/docker-ci
iglocska 2021-06-29 11:52:07 +02:00
parent 45d34ee43f 54924709a7
commit 65bd9306ba
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Controller/Component/ACLComponent.php
View File

@ -68,11 +68,11 @@ class ACLComponent extends Component
'index' => ['*'] 'index' => ['*']
], ],
'Inbox' => [ 'Inbox' => [
'createEntry' => ['perm_admin', 'perm_sync'], 'createEntry' => ['OR' => ['perm_admin', 'perm_sync']],
'delete' => ['perm_admin'], 'delete' => ['perm_admin'],
'filtering' => ['perm_admin'], 'filtering' => ['perm_admin'],
'index' => ['perm_admin'], 'index' => ['perm_admin'],
'listProcessors' => ['perm_admin', 'perm_sync'], 'listProcessors' => ['OR' => ['perm_admin', 'perm_sync']],
'process' => ['perm_admin'], 'process' => ['perm_admin'],
'view' => ['perm_admin'], 'view' => ['perm_admin'],
], ],
@ -274,14 +274,14 @@ class ACLComponent extends Component
} }
if (isset($this->aclList[$controller][$action]['OR'])) { if (isset($this->aclList[$controller][$action]['OR'])) {
foreach ($this->aclList[$controller][$action]['OR'] as $permission) { foreach ($this->aclList[$controller][$action]['OR'] as $permission) {
if ($user['Role'][$permission]) { if ($this->user['role'][$permission]) {
return true; return true;
} }
} }
} elseif (isset($this->aclList[$controller][$action]['AND'])) { } elseif (isset($this->aclList[$controller][$action]['AND'])) {
$allConditionsMet = true; $allConditionsMet = true;
foreach ($this->aclList[$controller][$action]['AND'] as $permission) { foreach ($this->aclList[$controller][$action]['AND'] as $permission) {
if (!$user['Role'][$permission]) { if (!$this->user['role'][$permission]) {
$allConditionsMet = false; $allConditionsMet = false;
} }
} }

3
src/Controller/UsersController.php
View File

@ -13,7 +13,8 @@ class UsersController extends AppController
{ {
$this->CRUD->index([ $this->CRUD->index([
'contain' => ['Individuals', 'Roles'], 'contain' => ['Individuals', 'Roles'],
'filters' => ['Users.email', 'uuid'] 'filters' => ['Users.email', 'uuid'],
'quickFilters' => ['uuid', ['username' => true], ['Individuals.first_name' => true], ['Individuals.last_name' => true], 'Individuals.email'],
]); ]);
if ($this->ParamHandler->isRest()) { if ($this->ParamHandler->isRest()) {
return $this->restResponsePayload; return $this->restResponsePayload;