From e0e7376c1da2fe6d22d737b0da78d0fa46f57459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 17 Jul 2018 17:34:59 +0200 Subject: [PATCH] generate entry "my tasks" dynamically --- Controller/SingleTaskController.php | 2 +- Menu/UserMenuBuilder.php | 24 +++++++++++++++++++++++- Resources/config/services/menu.yml | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Controller/SingleTaskController.php b/Controller/SingleTaskController.php index 2125bb2f3..c01723419 100644 --- a/Controller/SingleTaskController.php +++ b/Controller/SingleTaskController.php @@ -315,7 +315,7 @@ class SingleTaskController extends Controller * @return Response * @Route( * "/{_locale}/task/single-task/list/my", - * options={ "menus": { "user": { "order": -10, "label": "My tasks", "icon": "tasks" } } } + * name="chill_task_single_my_tasks" * ) */ public function myTasksAction(TranslatorInterface $translator) diff --git a/Menu/UserMenuBuilder.php b/Menu/UserMenuBuilder.php index 5a726b989..e29239679 100644 --- a/Menu/UserMenuBuilder.php +++ b/Menu/UserMenuBuilder.php @@ -24,6 +24,8 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt use Chill\TaskBundle\Repository\SingleTaskRepository; use Symfony\Component\Translation\TranslatorInterface; use Chill\MainBundle\Entity\User; +use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; +use Chill\TaskBundle\Security\Authorization\TaskVoter; /** * @@ -50,14 +52,22 @@ class UserMenuBuilder implements LocalMenuBuilderInterface */ public $translator; + /** + * + * @var AuthorizationCheckerInterface + */ + public $authorizationChecker; + public function __construct( CountNotificationTask $counter, TokenStorageInterface $tokenStorage, - TranslatorInterface $translator + TranslatorInterface $translator, + AuthorizationCheckerInterface $authorizationChecker ) { $this->counter = $counter; $this->tokenStorage = $tokenStorage; $this->translator = $translator; + $this->authorizationChecker = $authorizationChecker; } public static function getMenuIds(): array @@ -67,6 +77,10 @@ class UserMenuBuilder implements LocalMenuBuilderInterface public function buildMenu($menuId, MenuItem $menu, array $parameters) { + if (FALSE === $this->authorizationChecker->isGranted(TaskVoter::SHOW)) { + return; + } + $user = $this->tokenStorage->getToken()->getUser(); $ended = $this->counter->countNotificationEnded($user); $warning = $this->counter->countNotificationWarning($user); @@ -92,6 +106,14 @@ class UserMenuBuilder implements LocalMenuBuilderInterface $warning, -14); } + + $menu->addChild("My tasks", [ + 'route' => 'chill_task_single_my_tasks' + ]) + ->setExtras([ + 'order' => -10, + 'icon' => 'tasks' + ]); } protected function addItemInMenu(MenuItem $menu, User $u, $message, $title, $status, $number, $order) diff --git a/Resources/config/services/menu.yml b/Resources/config/services/menu.yml index cbaded857..3c74fe498 100644 --- a/Resources/config/services/menu.yml +++ b/Resources/config/services/menu.yml @@ -4,6 +4,7 @@ services: $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface' $counter: '@Chill\TaskBundle\Templating\UI\CountNotificationTask' $translator: '@Symfony\Component\Translation\TranslatorInterface' + $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface' tags: - { name: 'chill.menu_builder' }