From bb86d04e522265f27e2733c947bfb496c14201e1 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 25 Feb 2022 14:02:18 +0100 Subject: [PATCH] csfixes --- .../Menu/AccompanyingCourseMenuBuilder.php | 5 ++- .../MenuBuilder/LocationMenuBuilder.php | 1 - .../MenuBuilder/SectionMenuBuilder.php | 3 -- .../Routing/MenuBuilder/UserMenuBuilder.php | 4 +-- .../Controller/HouseholdMemberController.php | 1 - .../Menu/AccompanyingCourseMenuBuilder.php | 1 - .../Menu/HouseholdMenuBuilder.php | 1 - .../Menu/PersonMenuBuilder.php | 2 +- .../ChillTaskBundle/Menu/MenuBuilder.php | 32 +++++++++---------- .../ChillTaskBundle/Menu/UserMenuBuilder.php | 1 - 10 files changed, 21 insertions(+), 30 deletions(-) diff --git a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php index 05f47ded4..f669d8031 100644 --- a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php +++ b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php @@ -24,12 +24,12 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface { protected AuthorizationHelper $authorizationHelper; + protected Security $security; + protected TokenStorageInterface $tokenStorage; protected TranslatorInterface $translator; - protected Security $security; - public function __construct( TokenStorageInterface $tokenStorage, AuthorizationHelper $authorizationHelper, @@ -47,7 +47,6 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface $period = $parameters['accompanyingCourse']; if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()) { - if ($this->security->isGranted(AccompanyingPeriodVoter::SEE, $period)) { $menu->addChild($this->translator->trans('Calendar'), [ 'route' => 'chill_calendar_calendar_list', diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php index b0c83a7a4..29157f407 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php @@ -25,7 +25,6 @@ class LocationMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderI public function buildMenu($menuId, MenuItem $menu, array $parameters) { - if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) { return; } diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php index aac21241d..e228d73b1 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php @@ -22,7 +22,6 @@ use Symfony\Contracts\Translation\TranslatorInterface; */ class SectionMenuBuilder implements LocalMenuBuilderInterface { - protected AuthorizationCheckerInterface $authorizationChecker; protected TranslatorInterface $translator; @@ -42,7 +41,6 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface public function buildMenu($menuId, MenuItem $menu, array $parameters) { if (!$this->authorizationChecker->isGranted('ROLE_USER')) { - $menu->addChild($this->translator->trans('Homepage'), [ 'route' => 'chill_main_homepage', ]) @@ -61,7 +59,6 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface ); } - if ($this->authorizationChecker->isGranted(ChillExportVoter::EXPORT)) { $menu->addChild($this->translator->trans('Export Menu'), [ 'route' => 'chill_main_export_index', diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php index 9f1e538c1..af6315b75 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php @@ -21,6 +21,8 @@ use Symfony\Contracts\Translation\TranslatorInterface; class UserMenuBuilder implements LocalMenuBuilderInterface { + private AuthorizationCheckerInterface $authorizationChecker; + private NotificationByUserCounter $notificationByUserCounter; private Security $security; @@ -29,8 +31,6 @@ class UserMenuBuilder implements LocalMenuBuilderInterface private WorkflowByUserCounter $workflowByUserCounter; - private AuthorizationCheckerInterface $authorizationChecker; - public function __construct( NotificationByUserCounter $notificationByUserCounter, WorkflowByUserCounter $workflowByUserCounter, diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php index bc1cd6613..554ac7333 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php @@ -57,7 +57,6 @@ class HouseholdMemberController extends ApiController */ public function editMembership(Request $request, HouseholdMember $member): Response { - $this->denyAccessUnlessGranted(HouseholdVoter::EDIT, $member); $form = $this->createForm(HouseholdMemberType::class, $member, [ diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php index 7d760db55..b3cb3b1c1 100644 --- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php @@ -94,7 +94,6 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface $workflow = $this->registry->get($period, 'accompanying_period_lifecycle'); if ($this->security->isGranted(AccompanyingPeriodVoter::EDIT, $period)) { - if (null !== $period->getClosingDate()) { $menu->addChild($this->translator->trans('Re-open accompanying course'), [ 'route' => 'chill_person_accompanying_course_reopen', diff --git a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php index adf9f5722..73d6afc7e 100644 --- a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php @@ -77,7 +77,6 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface ], ]) ->setExtras(['order' => 30]); } - } public static function getMenuIds(): array diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php index 4f950e83b..a52fed280 100644 --- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php @@ -51,7 +51,6 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface public function buildMenu($menuId, MenuItem $menu, array $parameters) { if ($this->security->isGranted(PersonVoter::SEE, $parameters['person'])) { - $menu->addChild($this->translator->trans('Person details'), [ 'route' => 'chill_person_view', 'routeParameters' => [ @@ -106,6 +105,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface 'order' => 100, ]); } + if ($this->security->isGranted(PersonVoter::SEE, $parameters['person'])) { $menu->addChild($this->translator->trans('person_resources_menu'), [ 'route' => 'chill_person_resource_list', diff --git a/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php index 1af439b0d..d0d416765 100644 --- a/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php +++ b/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php @@ -32,6 +32,22 @@ class MenuBuilder implements LocalMenuBuilderInterface $this->authorizationChecker = $authorizationChecker; } + public function buildAccompanyingCourseMenu($menu, $parameters) + { + $course = $parameters['accompanyingCourse']; + + if ($this->authorizationChecker->isGranted(TaskVoter::SHOW, $course)) { + $menu->addChild( + $this->translator->trans('Tasks'), + [ + 'route' => 'chill_task_singletask_by-course_list', + 'routeParameters' => ['id' => $course->getId()], + ] + ) + ->setExtra('order', 400); + } + } + public function buildMenu($menuId, MenuItem $menu, array $parameters) { switch ($menuId) { @@ -55,22 +71,6 @@ class MenuBuilder implements LocalMenuBuilderInterface } } - public function buildAccompanyingCourseMenu($menu, $parameters) - { - $course = $parameters['accompanyingCourse']; - - if ($this->authorizationChecker->isGranted(TaskVoter::SHOW, $course)) { - $menu->addChild( - $this->translator->trans('Tasks'), - [ - 'route' => 'chill_task_singletask_by-course_list', - 'routeParameters' => ['id' => $course->getId()], - ] - ) - ->setExtra('order', 400); - } - } - public function buildPersonMenu($menu, $parameters) { //var $person \Chill\PersonBundle\Entity\Person */ diff --git a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php index ef329979e..fac89d56a 100644 --- a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php +++ b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php @@ -21,7 +21,6 @@ use Symfony\Contracts\Translation\TranslatorInterface; class UserMenuBuilder implements LocalMenuBuilderInterface { - public AuthorizationCheckerInterface $authorizationChecker; public CountNotificationTask $counter;