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-28 23:55:49 +02:00
parent 0e8a6cbe1c f22ad57575
commit 72b98acd23
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
3 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,15 +51,31 @@ class ACLComponent extends Component
'Broods' => [ 'Broods' => [
'add' => ['perm_admin'], 'add' => ['perm_admin'],
'delete' => ['perm_admin'], 'delete' => ['perm_admin'],
'downloadIndividual' => ['perm_admin'],
'downloadOrg' => ['perm_admin'],
'downloadSharingGroup' => ['perm_admin'],
'edit' => ['perm_admin'], 'edit' => ['perm_admin'],
'index' => ['perm_admin'], 'index' => ['perm_admin'],
'interconnectTools' => ['perm_admin'],
'previewIndex' => ['perm_admin'],
'testConnection' => ['perm_admin'],
'view' => ['perm_admin'] 'view' => ['perm_admin']
], ],
'EncryptionKeys' => [ 'EncryptionKeys' => [
'add' => ['*'], 'add' => ['*'],
'edit' => ['*'],
'delete' => ['*'], 'delete' => ['*'],
'index' => ['*'] 'index' => ['*']
], ],
'Inbox' => [
'createEntry' => ['perm_admin', 'perm_sync'],
'delete' => ['perm_admin'],
'filtering' => ['perm_admin'],
'index' => ['perm_admin'],
'listProcessors' => ['perm_admin', 'perm_sync'],
'process' => ['perm_admin'],
'view' => ['perm_admin'],
],
'Individuals' => [ 'Individuals' => [
'add' => ['perm_admin'], 'add' => ['perm_admin'],
'delete' => ['perm_admin'], 'delete' => ['perm_admin'],
@ -69,8 +85,25 @@ class ACLComponent extends Component
], ],
'Instance' => [ 'Instance' => [
'home' => ['*'], 'home' => ['*'],
'migrate' => ['perm_admin'],
'migrationIndex' => ['perm_admin'],
'rollback' => ['perm_admin'],
'status' => ['*'] 'status' => ['*']
], ],
'LocalTools' => [
'action' => ['perm_admin'],
'add' => ['perm_admin'],
'broodTools' => ['perm_admin'],
'connectionRequest' => ['perm_admin'],
'connectLocal' => ['perm_admin'],
'delete' => ['perm_admin'],
'edit' => ['perm_admin'],
'exposedTools' => ['perm_admin'],
'index' => ['perm_admin'],
'connectorIndex' => ['perm_admin'],
'view' => ['perm_admin'],
'viewConnector' => ['perm_admin']
],
'MetaTemplateFields' => [ 'MetaTemplateFields' => [
'index' => ['perm_admin'] 'index' => ['perm_admin']
], ],
@ -79,15 +112,26 @@ class ACLComponent extends Component
'enable' => ['perm_admin'], 'enable' => ['perm_admin'],
'index' => ['perm_admin'], 'index' => ['perm_admin'],
'update' => ['perm_admin'], 'update' => ['perm_admin'],
'toggle' => ['perm_admin'],
'view' => ['perm_admin'] 'view' => ['perm_admin']
], ],
'Organisations' => [ 'Organisations' => [
'add' => ['perm_admin'], 'add' => ['perm_admin'],
'delete' => ['perm_admin'], 'delete' => ['perm_admin'],
'edit' => ['perm_admin'], 'edit' => ['perm_admin'],
'filtering' => ['*'],
'index' => ['*'], 'index' => ['*'],
'view' => ['*'] 'view' => ['*']
], ],
'Outbox' => [
'createEntry' => ['perm_admin'],
'delete' => ['perm_admin'],
'filtering' => ['perm_admin'],
'index' => ['perm_admin'],
'listProcessors' => ['perm_admin'],
'process' => ['perm_admin'],
'view' => ['perm_admin']
],
'Pages' => [ 'Pages' => [
'display' => ['*'] 'display' => ['*']
], ],
@ -115,6 +159,8 @@ class ACLComponent extends Component
'index' => ['perm_admin'], 'index' => ['perm_admin'],
'login' => ['*'], 'login' => ['*'],
'logout' => ['*'], 'logout' => ['*'],
'register' => ['*'],
'toggle' => ['perm_admin'],
'view' => ['*'] 'view' => ['*']
] ]
); );

2
src/Controller/RolesController.php
View File

@ -15,7 +15,7 @@ class RolesController extends AppController
public function index() public function index()
{ {
$this->CRUD->index([ $this->CRUD->index([
'filters' => ['name', 'uuid', 'perm_admin'], 'filters' => ['name', 'uuid', 'perm_admin', 'Users.id'],
'quickFilters' => ['name'] 'quickFilters' => ['name']
]); ]);
if ($this->ParamHandler->isRest()) { if ($this->ParamHandler->isRest()) {

4
templates/Users/view.php
View File

@ -43,12 +43,12 @@ echo $this->element(
], ],
'children' => [ 'children' => [
[ [
'url' => '/AuthKeys/index?users_id={{0}}', 'url' => '/AuthKeys/index?Users.id={{0}}',
'url_params' => ['id'], 'url_params' => ['id'],
'title' => __('Authentication keys') 'title' => __('Authentication keys')
], ],
[ [
'url' => '/EncryptionKeys/index?users_id={{0}}', 'url' => '/EncryptionKeys/index?Users.id={{0}}',
'url_params' => ['id'], 'url_params' => ['id'],
'title' => __('Encryption keys') 'title' => __('Encryption keys')
] ]