From 1337360690d80e1d599eaf064b77e33084e5bfb9 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 24 May 2023 12:44:02 +0200 Subject: [PATCH] Fixed [search page] quickMenu: improve position and design, manage duplicate buttons --- .../ChillMainBundle/Menu/quick_menu.html.twig | 7 ++--- .../Menu/PersonQuickMenuBuilder.php | 27 ++++++++++++++----- .../public/chill/scss/flex_table.scss | 2 +- .../views/Person/list_with_period.html.twig | 7 +---- .../config/services/menu.yaml | 18 +++---------- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Menu/quick_menu.html.twig b/src/Bundle/ChillMainBundle/Menu/quick_menu.html.twig index 417e2b2d9..ec0a21181 100644 --- a/src/Bundle/ChillMainBundle/Menu/quick_menu.html.twig +++ b/src/Bundle/ChillMainBundle/Menu/quick_menu.html.twig @@ -1,11 +1,12 @@ {% if menus|length > 0 %}
  • - + aria-expanded="false"> + {{ 'Create'|trans }} +
    {% for menu in menus %} authorizationChecker = $authorizationChecker; + } + public static function getMenuIds(): array { return ['person_quick_menu']; @@ -17,16 +26,20 @@ class PersonQuickMenuBuilder implements LocalMenuBuilderInterface /** @var \Chill\PersonBundle\Entity\Person $person */ $person = $parameters['person']; - $menu->addChild('Create Accompanying Course', [ - 'route' => 'chill_person_accompanying_course_new', - 'routeParameters' => [ - 'person_id' => $person->getId(), - ], ]) + if ($this->authorizationChecker->isGranted(AccompanyingPeriodVoter::CREATE, $person)) { + $menu->addChild( + 'Create Accompanying Course', [ + 'route' => 'chill_person_accompanying_course_new', + 'routeParameters' => [ + 'person_id' => [ $person->getId() ], + ], + ] + ) ->setExtras([ 'order' => 10, 'icon' => 'plus' - ]) - ; + ]); + } } } \ No newline at end of file diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss index 30cac9c85..86bc775f7 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss @@ -30,7 +30,7 @@ div.list-with-period { // override wrap-list div.wrap-list.periods-list { - padding-right: 1rem; + padding-right: 0; div.wl-row { flex-wrap: nowrap; div.wl-col { diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig index 47b0b6f0f..aa848f9d9 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig @@ -15,11 +15,6 @@ 'args' : { 'person': person } }) }} - {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE', person) %} -
  • - -
    • - {% endif %} {% endmacro %} {% macro accompanying_period(acp, person) %} @@ -194,7 +189,7 @@ {% endif %} -