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

new permission to hide user choice in report (#2572)

Browse Source
This commit is contained in:
Kevin Papst
2021-05-16 00:52:42 +02:00
committed by GitHub
parent f7aa3c1e13
commit dd83872339
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Controller/Reporting/ReportByUserController.php
View File

@@ -42,7 +42,7 @@ final class ReportByUserController extends AbstractController
private function canSelectUser(): bool private function canSelectUser(): bool
{ {
// also found in App\EventSubscriber\Actions\UserSubscriber // also found in App\EventSubscriber\Actions\UserSubscriber
if (!$this->isGranted('view_other_timesheet')) { if (!$this->isGranted('view_other_timesheet') || !$this->isGranted('view_other_reporting')) {
return false; return false;
} }

3
src/EventSubscriber/Actions/UserSubscriber.php
View File

@@ -60,7 +60,8 @@ class UserSubscriber extends AbstractActionsSubscriber
$viewOther = $this->isGranted('view_other_timesheet'); $viewOther = $this->isGranted('view_other_timesheet');
if ($this->isGranted('view_reporting')) { if ($this->isGranted('view_reporting')) {
if ($viewOther || ($event->getUser()->getId() === $user->getId())) { // also found in App\Controller\Reporting\ReportByUserController
if (($viewOther && $this->isGranted('view_other_reporting')) || ($event->getUser()->getId() === $user->getId())) {
$event->addAction('menu.reporting', ['url' => $this->path('report_user_month', ['user' => $user->getId()]), 'icon' => 'reporting']); $event->addAction('menu.reporting', ['url' => $this->path('report_user_month', ['user' => $user->getId()]), 'icon' => 'reporting']);
} }
} }