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

Release 2.0.18 (#4003)

Browse Source 
* prevent too long values for user preferences
* add chart value 0 to y-axis if last value > 0, to always display the zero line (project details)
* add user-preferences to invoice hydrator
* DateTime vs DateTimeInterface
* simplify permission config
* fix query for teamleads limiting to only selected teams not possible
This commit is contained in:
Kevin Papst
2023-05-08 17:11:55 +02:00
committed by GitHub
parent d8f72b8b88
commit 1099e76244
74 changed files with 627 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/DependencyInjection/AppExtension.php
View File

@@ -152,9 +152,6 @@ final class AppExtension extends Extension
// permissions as well, which are off by default for all roles
foreach ($config['sets'] as $set => $permNames) {
foreach ($permNames as $name) {
if (str_starts_with($name, '@') || str_starts_with($name, '!')) {
continue;
}
$names[$name] = true;
}
}
@@ -169,9 +166,7 @@ final class AppExtension extends Extension
$exception->setPath('kimai.permissions.maps.' . $role);
throw $exception;
}
$roles[$role] = array_merge($roles[$role] ?? [], $this->getFilteredPermissions(
$this->extractSinglePermissionsFromSet($config, $set)
));
$roles[$role] = array_merge($roles[$role] ?? [], $this->extractSinglePermissionsFromSet($config, $set));
}
}
@@ -182,7 +177,7 @@ final class AppExtension extends Extension
$roles[$name][$name2] = true;
}
}
$config['roles'][$name] = $this->getFilteredPermissions($roles[$name]);
$config['roles'][$name] = $roles[$name];
}
// make sure to apply all other permissions that might have been registered through plugins
@@ -205,21 +200,6 @@ final class AppExtension extends Extension
$container->setParameter('kimai.permission_roles', array_map('strtoupper', array_values(array_unique($roles))));
}
private function getFilteredPermissions(array $permissions): array
{
$deleteFromArray = array_filter($permissions, function ($permission): bool {
return $permission[0] === '!';
}, ARRAY_FILTER_USE_KEY);
return array_filter($permissions, function ($permission) use ($deleteFromArray): bool {
if ($permission[0] === '!') {
return false;
}
return !\array_key_exists('!' . $permission, $deleteFromArray);
}, ARRAY_FILTER_USE_KEY);
}
private function extractSinglePermissionsFromSet(array $permissions, string $name): array
{
if (!isset($permissions['sets'][$name])) {
@@ -229,14 +209,7 @@ final class AppExtension extends Extension
$result = [];
foreach ($permissions['sets'][$name] as $permissionName) {
if ($permissionName[0] === '@') {
$result = array_merge(
$result,
$this->extractSinglePermissionsFromSet($permissions, substr($permissionName, 1))
);
} else {
$result[$permissionName] = true;
}
$result[$permissionName] = true;
}
return $result;