diff --git a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php index 72f938c88..79abbbcce 100644 --- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php +++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php @@ -34,7 +34,7 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface 'route' => 'chill_activity_admin_index', ]) ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 5000, 'header' => true]); + ->setExtras(['order' => 5000]); $menu->addChild('Activity Reasons', [ 'route' => 'chill_activity_activityreason', diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php index 70d295027..ae463d240 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php @@ -26,5 +26,4 @@ class AdminController extends AbstractController { return $this->render('ChillAsideActivityBundle:Admin:index.html.twig'); } - } diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php index e58d98fc2..30b587a7e 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php @@ -14,8 +14,6 @@ namespace Chill\AsideActivityBundle\Menu; use Knp\Menu\MenuItem; use Symfony\Component\Security\Core\Security; -use function in_array; - final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface { private Security $security; @@ -38,7 +36,6 @@ final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuild ->setAttribute('class', 'list-group-item-header') ->setExtras([ 'order' => 7000, - 'header' => true, 'explain' => 'Aside activity type configuration', ]); $menu diff --git a/src/Bundle/ChillCalendarBundle/Controller/AdminController.php b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php index 88d78d229..9b9195b82 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/AdminController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php @@ -17,7 +17,7 @@ use Symfony\Component\Routing\Annotation\Route; class AdminController extends AbstractController { /** - * Calendar admin + * Calendar admin. * * @Route("/{_locale}/admin/calendar", name="chill_calendar_admin_index") */ @@ -25,5 +25,4 @@ class AdminController extends AbstractController { return $this->render('ChillCalendarBundle:Admin:index.html.twig'); } - } diff --git a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php index ad5d96d9a..d86d0062a 100644 --- a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php +++ b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php @@ -37,7 +37,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface 'route' => 'chill_calendar_admin_index', ]) ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 6000, 'header' => true]); + ->setExtras(['order' => 6000]); $menu->addChild('Cancel reason', [ 'route' => 'chill_crud_calendar_cancel-reason_index', diff --git a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php index f955b1d2e..c90239f70 100644 --- a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php +++ b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php @@ -37,7 +37,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface 'route' => 'chill_docstore_admin', ]) ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 4000, 'header' => true]); + ->setExtras(['order' => 4000]); $menu->addChild('Document category list', [ 'route' => 'chill_docstore_category_admin', diff --git a/src/Bundle/ChillMainBundle/Controller/AdminController.php b/src/Bundle/ChillMainBundle/Controller/AdminController.php index ce2fc7cdc..56eac11e4 100644 --- a/src/Bundle/ChillMainBundle/Controller/AdminController.php +++ b/src/Bundle/ChillMainBundle/Controller/AdminController.php @@ -24,14 +24,6 @@ class AdminController extends AbstractController return $this->render('@ChillMain/Admin/index.html.twig'); } - /** - * @Route("/{_locale}/admin/user", name="chill_main_user_admin") - */ - public function indexUserAction() - { - return $this->render('@ChillMain/Admin/indexUser.html.twig'); - } - /** * @Route("/{_locale}/admin/language", name="chill_main_language_admin") */ @@ -47,4 +39,12 @@ class AdminController extends AbstractController { return $this->render('@ChillMain/Admin/indexLocation.html.twig'); } + + /** + * @Route("/{_locale}/admin/user", name="chill_main_user_admin") + */ + public function indexUserAction() + { + return $this->render('@ChillMain/Admin/indexUser.html.twig'); + } } diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php index 525d79b80..138e63730 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php @@ -38,7 +38,7 @@ class AdminLanguageMenuBuilder implements LocalMenuBuilderInterface 'route' => 'chill_main_language_admin', ]) ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 1200, 'header' => true]); + ->setExtras(['order' => 1200]); $menu->addChild('Language list', [ 'route' => 'chill_crud_main_language_index', diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php index 95b9a7ff8..972504658 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php @@ -38,7 +38,7 @@ class AdminLocationMenuBuilder implements LocalMenuBuilderInterface 'route' => 'chill_main_location_admin', ]) ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 1300, 'header' => true]); + ->setExtras(['order' => 1300]); $menu->addChild('Location type list', [ 'route' => 'chill_crud_main_location_type_index', diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php index 5f7e5fc23..3145b0342 100644 --- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php +++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php @@ -38,7 +38,7 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface 'route' => 'chill_main_user_admin', ]) ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 1000, 'header' => true]); + ->setExtras(['order' => 1000]); $menu->addChild('Center list', [ 'route' => 'admin_center', diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminController.php b/src/Bundle/ChillPersonBundle/Controller/AdminController.php index c05902e18..b59cbc4a5 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AdminController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AdminController.php @@ -19,14 +19,6 @@ use Symfony\Component\Routing\Annotation\Route; */ class AdminController extends AbstractController { - /** - * @return \Symfony\Component\HttpFoundation\RedirectResponse - */ - public function redirectToAdminIndexAction() - { - return $this->redirectToRoute('chill_main_admin_central'); - } - /** * @Route("/{_locale}/admin/accompanying-course", name="chill_accompanying-course_admin_index") */ @@ -58,4 +50,12 @@ class AdminController extends AbstractController { return $this->render('ChillPersonBundle:Admin:indexSocialWork.html.twig'); } + + /** + * @return \Symfony\Component\HttpFoundation\RedirectResponse + */ + public function redirectToAdminIndexAction() + { + return $this->redirectToRoute('chill_main_admin_central'); + } } diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php index 079751842..a049b2045 100644 --- a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php @@ -37,7 +37,7 @@ class AdminAccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface 'route' => 'chill_accompanying-course_admin_index', ]) ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 2200, 'header' => true]); + ->setExtras(['order' => 2200]); $menu->addChild('person_admin.closing motives', [ 'route' => 'chill_crud_closing_motive_index', @@ -46,7 +46,6 @@ class AdminAccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface $menu->addChild('person_admin.origin', [ 'route' => 'chill_crud_origin_index', ])->setExtras(['order' => 2210]); - } public static function getMenuIds(): array diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php index 2c8cd9c3f..50a894b5b 100644 --- a/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php @@ -37,7 +37,7 @@ class AdminHouseholdMenuBuilder implements LocalMenuBuilderInterface 'route' => 'chill_household_admin_index', ]) ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 2100, 'header' => true]); + ->setExtras(['order' => 2100]); $menu->addChild('Position', [ 'route' => 'chill_crud_person_household_position_index', @@ -46,7 +46,6 @@ class AdminHouseholdMenuBuilder implements LocalMenuBuilderInterface $menu->addChild('person_admin.relation', [ 'route' => 'chill_crud_person_relation_index', ])->setExtras(['order' => 2120]); - } public static function getMenuIds(): array diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php index a218c06e0..94dd3897a 100644 --- a/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php @@ -37,7 +37,7 @@ class AdminPersonMenuBuilder implements LocalMenuBuilderInterface 'route' => 'chill_person_admin_index', ]) ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 2000, 'header' => true]); + ->setExtras(['order' => 2000]); $menu->addChild('Civility', [ 'route' => 'chill_crud_main_civility_index', @@ -50,7 +50,6 @@ class AdminPersonMenuBuilder implements LocalMenuBuilderInterface $menu->addChild('person_admin.person_resource_kind', [ 'route' => 'chill_crud_person_resource-kind_index', ])->setExtras(['order' => 2030]); - } public static function getMenuIds(): array diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php index 560b9e275..a2e30b7a4 100644 --- a/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php @@ -37,7 +37,7 @@ class AdminSocialWorkMenuBuilder implements LocalMenuBuilderInterface 'route' => 'chill_social-work_admin_index', ]) ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 2300, 'header' => true]); + ->setExtras(['order' => 2300]); $menu->addChild('person_admin.social_action', [ 'route' => 'chill_crud_social_action_index', diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php index 031227159..187ce3d8d 100644 --- a/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php +++ b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php @@ -17,7 +17,7 @@ use Symfony\Component\Routing\Annotation\Route; class AdminController extends AbstractController { /** - * ThirdParty admin + * ThirdParty admin. * * @Route("/{_locale}/admin/thirdparty", name="chill_thirdparty_admin_index") */ @@ -25,5 +25,4 @@ class AdminController extends AbstractController { return $this->render('ChillThirdPartyBundle:Admin:index.html.twig'); } - -} \ No newline at end of file +} diff --git a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php index 170cc3918..0da9c95e0 100644 --- a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php +++ b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php @@ -37,7 +37,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface 'route' => 'chill_thirdparty_admin_index', ]) ->setAttribute('class', 'list-group-item-header') - ->setExtras(['order' => 3000, 'header' => true]); + ->setExtras(['order' => 3000]); $menu->addChild('Third party category', [ 'route' => 'chill_crud_thirdparty_thirdparty-category_index',