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

Release 2.0.12 (#3947)

Browse Source 
- added submenus in action drodowns, to shorten them
- show all user-edit-screens in action dropdown
- fix cascade delete teams through customer
- fix cascade delete customer/project/activity through teams
- fix responsive classes for "internal rate" column
- clarify error message if invoice number generator or calculator is missing
This commit is contained in:
Kevin Papst
2023-03-24 00:47:36 +01:00
committed by GitHub
parent 3a5d7a62de
commit 04b5eb4c38
19 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,9 +11,17 @@ namespace App\EventSubscriber\Actions;
use App\Entity\User;
use App\Event\PageActionsEvent;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
final class UserSubscriber extends AbstractActionsSubscriber
{
public function __construct(AuthorizationCheckerInterface $auth, UrlGeneratorInterface $urlGenerator, private EventDispatcherInterface $eventDispatcher)
{
parent::__construct($auth, $urlGenerator);
}
public static function getActionName(): string
{
return 'user';
@@ -23,10 +31,7 @@ final class UserSubscriber extends AbstractActionsSubscriber
{
$payload = $event->getPayload();
/** @var User $user */
$user = $payload['user'];
if ($user->getId() === null) {
if (($user = $payload['user']) === null || !$user instanceof User || $user->getId() === null) {
return;
}
@@ -35,21 +40,20 @@ final class UserSubscriber extends AbstractActionsSubscriber
$event->addDivider();
}
if ($this->isGranted('edit', $user)) {
$event->addAction('edit', ['url' => $this->path('user_profile_edit', ['username' => $user->getUserIdentifier()]), 'title' => 'edit', 'translation_domain' => 'actions']);
$subEvent = new PageActionsEvent($user, ['user' => $user], 'user_forms', 'index');
$this->eventDispatcher->dispatch($subEvent, $subEvent->getEventName());
foreach ($subEvent->getActions() as $id => $action) {
$event->addActionToSubmenu('edit', $id, $action);
}
if ($this->isGranted('preferences', $user)) {
$event->addConfig($this->path('user_profile_preferences', ['username' => $user->getUserIdentifier()]));
}
if ($this->isGranted('report:other') || ($this->isGranted('report:user') && $event->getUser()->getId() === $user->getId())) {
if (($event->getUser()->getId() === $user->getId() && $this->isGranted('report:user')) || $this->isGranted('report:other')) {
$event->addActionToSubmenu('report', 'weekly', ['url' => $this->path('report_user_week', ['user' => $user->getId()]), 'translation_domain' => 'reporting', 'title' => 'report_user_week']);
$event->addActionToSubmenu('report', 'monthly', ['url' => $this->path('report_user_month', ['user' => $user->getId()]), 'translation_domain' => 'reporting', 'title' => 'report_user_month']);
$event->addActionToSubmenu('report', 'yearly', ['url' => $this->path('report_user_year', ['user' => $user->getId()]), 'translation_domain' => 'reporting', 'title' => 'report_user_year']);
}
if ($this->isGranted('view_other_timesheet') && $user->isEnabled()) {
if ($user->isEnabled() && $this->isGranted('view_other_timesheet')) {
$event->addActionToSubmenu('filter', 'timesheet', ['url' => $this->path('admin_timesheet', ['users[]' => $user->getId()]), 'title' => 'timesheet.filter', 'translation_domain' => 'actions']);
}