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

chg: [menu system] fixes and updates 

changes:
- added "popup" as a new flag for the menu element in the ACL component - links in the menues will be popovers for these
- added some missing links

bug fixes:
- fixed a bug breaking the adding of sharing groups due to the id variable not being set

as reported by cert.pl
pull/32/head
iglocska 2020-11-06 13:21:45 +01:00
parent ff9c60902b
commit ac79db5699
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
3 changed files with 58 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -420,7 +420,8 @@ class ACLComponent extends Component
],
'add' => [
'url' => '/individuals/add',
'label' => __('Add individual')
'label' => __('Add individual'),
'popup' => 1
],
'view' => [
'url' => '/individuals/view/{{id}}',
@ -432,13 +433,15 @@ class ACLComponent extends Component
'url' => '/individuals/edit/{{id}}',
'label' => __('Edit individual'),
'actions' => ['edit', 'delete', 'view'],
'skipTopMenu' => 1
'skipTopMenu' => 1,
'popup' => 1
],
'delete' => [
'url' => '/individuals/delete/{{id}}',
'label' => __('Delete individual'),
'actions' => ['delete', 'edit', 'view'],
'skipTopMenu' => 1
'skipTopMenu' => 1,
'popup' => 1
]
]
],
@ -452,7 +455,8 @@ class ACLComponent extends Component
],
'add' => [
'url' => '/organisations/add',
'label' => __('Add organisation')
'label' => __('Add organisation'),
'popup' => 1
],
'view' => [
'url' => '/organisations/view/{{id}}',
@ -464,13 +468,15 @@ class ACLComponent extends Component
'url' => '/organisations/edit/{{id}}',
'label' => __('Edit organisation'),
'actions' => ['edit', 'delete', 'view'],
'skipTopMenu' => 1
'skipTopMenu' => 1,
'popup' => 1
],
'delete' => [
'url' => '/organisations/delete/{{id}}',
'label' => __('Delete organisation'),
'actions' => ['delete', 'edit', 'view'],
'skipTopMenu' => 1
'skipTopMenu' => 1,
'popup' => 1
]
]
],
@ -484,13 +490,15 @@ class ACLComponent extends Component
],
'add' => [
'url' => '/encryptionKeys/add',
'label' => __('Add encryption key')
'label' => __('Add encryption key'),
'popup' => 1
],
'edit' => [
'url' => '/encryptionKeys/edit/{{id}}',
'label' => __('Edit organisation'),
'actions' => ['edit'],
'skipTopMenu' => 1
'skipTopMenu' => 1,
'popup' => 1
]
]
]
@ -506,13 +514,22 @@ class ACLComponent extends Component
],
'add' => [
'url' => '/SharingGroups/add',
'label' => __('Add sharing group')
'label' => __('Add sharing group'),
'popup' => 1
],
'edit' => [
'url' => '/SharingGroups/edit/{{id}}',
'label' => __('Edit sharing group'),
'actions' => ['edit'],
'skipTopMenu' => 1
'actions' => ['edit', 'view'],
'skipTopMenu' => 1,
'popup' => 1
],
'delete' => [
'url' => '/SharingGroups/delete/{{id}}',
'label' => __('Delete sharing group'),
'actions' => ['delete', 'edit', 'view'],
'skipTopMenu' => 1,
'popup' => 1
]
]
]
@ -528,7 +545,8 @@ class ACLComponent extends Component
],
'add' => [
'url' => '/roles/add',
'label' => __('Add role')
'label' => __('Add role'),
'popup' => 1
],
'view' => [
'url' => '/roles/view/{{id}}',
@ -540,13 +558,15 @@ class ACLComponent extends Component
'url' => '/roles/edit/{{id}}',
'label' => __('Edit role'),
'actions' => ['edit', 'delete', 'view'],
'skipTopMenu' => 1
'skipTopMenu' => 1,
'popup' => 1
],
'delete' => [
'url' => '/roles/delete/{{id}}',
'label' => __('Delete role'),
'actions' => ['delete', 'edit', 'view'],
'skipTopMenu' => 1
'skipTopMenu' => 1,
'popup' => 1
]
]
],
@ -560,7 +580,8 @@ class ACLComponent extends Component
],
'add' => [
'url' => '/users/add',
'label' => __('Add user')
'label' => __('Add user'),
'popup' => 1
],
'view' => [
'url' => '/users/view/{{id}}',
@ -572,13 +593,15 @@ class ACLComponent extends Component
'url' => '/users/edit/{{id}}',
'label' => __('Edit user'),
'actions' => ['edit', 'delete', 'view'],
'skipTopMenu' => 1
'skipTopMenu' => 1,
'popup' => 1
],
'delete' => [
'url' => '/users/delete/{{id}}',
'label' => __('Delete user'),
'actions' => ['delete', 'edit', 'view'],
'skipTopMenu' => 1
'skipTopMenu' => 1,
'popup' => 1
]
]
],
@ -600,7 +623,8 @@ class ACLComponent extends Component
'url' => '/metaTemplates/delete/{{id}}',
'label' => __('Delete Meta Template'),
'actions' => ['delete', 'edit', 'view'],
'skipTopMenu' => 1
'skipTopMenu' => 1,
'popup' => 1
]
]
]
@ -619,6 +643,13 @@ class ACLComponent extends Component
'label' => __('View role'),
'actions' => ['delete', 'edit', 'view'],
'skipTopMenu' => 1
],
'delete' => [
'url' => '/roles/delete/{{id}}',
'label' => __('Delete Role'),
'actions' => ['delete', 'edit', 'view'],
'skipTopMenu' => 1,
'popup' => 1
]
]
],
@ -643,7 +674,8 @@ class ACLComponent extends Component
'url' => '/users/edit',
'label' => __('Edit My Profile'),
'actions' => ['delete', 'edit', 'view'],
'skipTopMenu' => 1
'skipTopMenu' => 1,
'popup' => 1
]
]
]

2
src/Controller/Component/CRUDComponent.php
View File

@ -97,7 +97,7 @@ class CRUDComponent extends Component
return;
}
if (empty($params['redirect'])) {
$this->Controller->redirect(['action' => 'view', $id]);
$this->Controller->redirect(['action' => 'view', $data->id]);
} else {
$this->Controller->redirect($params['redirect']);
}

7
templates/element/genericElements/side_menu_scaffold.php
View File

@ -34,8 +34,13 @@ if (isset($menu[$metaGroup])) {
}
}
$active = ($scope === $this->request->getParam('controller') && $action === $this->request->getParam('action'));
if (!empty($data['popup'])) {
$link_template = '<a href="#" onClick="populateAndLoadModal(\'%s\')" class="list-group-item list-group-item-action %s %s pl-3 border-0 %s">%s</a>';
} else {
$link_template = '<a href="%s" class="list-group-item list-group-item-action %s %s pl-3 border-0 %s">%s</a>';
}
$children .= sprintf(
'<a href="%s" class="list-group-item list-group-item-action %s %s pl-3 border-0 %s">%s</a>',
$link_template,
empty($data['url']) ? '#' : h($data['url']),
empty($data['class']) ? '' : h($data['class']),
$active ? 'active' : '',