jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

human friendly name for bundles (#1491)

Browse Source
This commit is contained in:
Kevin Papst
2020-02-22 22:56:37 +01:00
committed by GitHub
parent 6c7477f1a9
commit 0e507804b1
7 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Controller/PermissionController.php
View File

@@ -80,23 +80,23 @@ final class PermissionController extends AbstractController
// be careful, the order of the search keys is important!
$permissionOrder = [
new PermissionSection('User', '_user'),
new PermissionSection('User profile (own)', '_own_profile'),
new PermissionSection('User profile (other)', '_other_profile'),
new PermissionSection('Customer (Teamlead)', '_teamlead_customer'),
new PermissionSection('Customer (Team member)', '_team_customer'),
new PermissionSection('Customer (Admin)', '_customer'),
new PermissionSection('Project (Teamlead)', '_teamlead_project'),
new PermissionSection('Project (Team member)', '_team_project'),
new PermissionSection('Project (Admin)', '_project'),
new PermissionSection('Activity', '_activity'),
new PermissionSection('Timesheet (own)', '_own_timesheet'),
new PermissionSection('Timesheet (other)', '_other_timesheet'),
new PermissionSection('Timesheet', '_timesheet'),
new PermissionSection('Export', '_export'),
new PermissionSection('Invoice', '_invoice'),
new PermissionSection('Teams', '_team'),
new PermissionSection('Tags', '_tag'),
new PermissionSection('User profile (other)', '_other_profile'),
new PermissionSection('User profile (own)', '_own_profile'),
new PermissionSection('User', '_user'),
new PermissionSection('Customer (Admin)', '_customer'),
new PermissionSection('Customer (Team member)', '_team_customer'),
new PermissionSection('Customer (Teamlead)', '_teamlead_customer'),
new PermissionSection('Project (Admin)', '_project'),
new PermissionSection('Project (Team member)', '_team_project'),
new PermissionSection('Project (Teamlead)', '_teamlead_project'),
new PermissionSection('Activity', '_activity'),
new PermissionSection('Timesheet', '_timesheet'),
new PermissionSection('Timesheet (other)', '_other_timesheet'),
new PermissionSection('Timesheet (own)', '_own_timesheet'),
];
$event = new PermissionSectionsEvent();
@@ -115,7 +115,7 @@ final class PermissionController extends AbstractController
foreach ($this->manager->getPermissions() as $permission) {
$found = false;
foreach ($event->getSections() as $section) {
foreach (array_reverse($event->getSections()) as $section) {
if ($section->filter($permission)) {
$permissionSorted[$section->getTitle()][] = $permission;
$found = true;