admin: remove obsolet header => true tag + php code fix

This commit is contained in:
nobohan 2022-05-10 11:46:17 +02:00
parent 0e8b73638f
commit be27df1fd5
17 changed files with 30 additions and 39 deletions

View File

@ -34,7 +34,7 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
'route' => 'chill_activity_admin_index', 'route' => 'chill_activity_admin_index',
]) ])
->setAttribute('class', 'list-group-item-header') ->setAttribute('class', 'list-group-item-header')
->setExtras(['order' => 5000, 'header' => true]); ->setExtras(['order' => 5000]);
$menu->addChild('Activity Reasons', [ $menu->addChild('Activity Reasons', [
'route' => 'chill_activity_activityreason', 'route' => 'chill_activity_activityreason',

View File

@ -26,5 +26,4 @@ class AdminController extends AbstractController
{ {
return $this->render('ChillAsideActivityBundle:Admin:index.html.twig'); return $this->render('ChillAsideActivityBundle:Admin:index.html.twig');
} }
} }

View File

@ -14,8 +14,6 @@ namespace Chill\AsideActivityBundle\Menu;
use Knp\Menu\MenuItem; use Knp\Menu\MenuItem;
use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\Security;
use function in_array;
final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
{ {
private Security $security; private Security $security;
@ -38,7 +36,6 @@ final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuild
->setAttribute('class', 'list-group-item-header') ->setAttribute('class', 'list-group-item-header')
->setExtras([ ->setExtras([
'order' => 7000, 'order' => 7000,
'header' => true,
'explain' => 'Aside activity type configuration', 'explain' => 'Aside activity type configuration',
]); ]);
$menu $menu

View File

@ -17,7 +17,7 @@ use Symfony\Component\Routing\Annotation\Route;
class AdminController extends AbstractController class AdminController extends AbstractController
{ {
/** /**
* Calendar admin * Calendar admin.
* *
* @Route("/{_locale}/admin/calendar", name="chill_calendar_admin_index") * @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'); return $this->render('ChillCalendarBundle:Admin:index.html.twig');
} }
} }

View File

@ -37,7 +37,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
'route' => 'chill_calendar_admin_index', 'route' => 'chill_calendar_admin_index',
]) ])
->setAttribute('class', 'list-group-item-header') ->setAttribute('class', 'list-group-item-header')
->setExtras(['order' => 6000, 'header' => true]); ->setExtras(['order' => 6000]);
$menu->addChild('Cancel reason', [ $menu->addChild('Cancel reason', [
'route' => 'chill_crud_calendar_cancel-reason_index', 'route' => 'chill_crud_calendar_cancel-reason_index',

View File

@ -37,7 +37,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
'route' => 'chill_docstore_admin', 'route' => 'chill_docstore_admin',
]) ])
->setAttribute('class', 'list-group-item-header') ->setAttribute('class', 'list-group-item-header')
->setExtras(['order' => 4000, 'header' => true]); ->setExtras(['order' => 4000]);
$menu->addChild('Document category list', [ $menu->addChild('Document category list', [
'route' => 'chill_docstore_category_admin', 'route' => 'chill_docstore_category_admin',

View File

@ -24,14 +24,6 @@ class AdminController extends AbstractController
return $this->render('@ChillMain/Admin/index.html.twig'); 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") * @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'); 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');
}
} }

View File

@ -38,7 +38,7 @@ class AdminLanguageMenuBuilder implements LocalMenuBuilderInterface
'route' => 'chill_main_language_admin', 'route' => 'chill_main_language_admin',
]) ])
->setAttribute('class', 'list-group-item-header') ->setAttribute('class', 'list-group-item-header')
->setExtras(['order' => 1200, 'header' => true]); ->setExtras(['order' => 1200]);
$menu->addChild('Language list', [ $menu->addChild('Language list', [
'route' => 'chill_crud_main_language_index', 'route' => 'chill_crud_main_language_index',

View File

@ -38,7 +38,7 @@ class AdminLocationMenuBuilder implements LocalMenuBuilderInterface
'route' => 'chill_main_location_admin', 'route' => 'chill_main_location_admin',
]) ])
->setAttribute('class', 'list-group-item-header') ->setAttribute('class', 'list-group-item-header')
->setExtras(['order' => 1300, 'header' => true]); ->setExtras(['order' => 1300]);
$menu->addChild('Location type list', [ $menu->addChild('Location type list', [
'route' => 'chill_crud_main_location_type_index', 'route' => 'chill_crud_main_location_type_index',

View File

@ -38,7 +38,7 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface
'route' => 'chill_main_user_admin', 'route' => 'chill_main_user_admin',
]) ])
->setAttribute('class', 'list-group-item-header') ->setAttribute('class', 'list-group-item-header')
->setExtras(['order' => 1000, 'header' => true]); ->setExtras(['order' => 1000]);
$menu->addChild('Center list', [ $menu->addChild('Center list', [
'route' => 'admin_center', 'route' => 'admin_center',

View File

@ -19,14 +19,6 @@ use Symfony\Component\Routing\Annotation\Route;
*/ */
class AdminController extends AbstractController 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") * @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 $this->render('ChillPersonBundle:Admin:indexSocialWork.html.twig');
} }
/**
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function redirectToAdminIndexAction()
{
return $this->redirectToRoute('chill_main_admin_central');
}
} }

View File

@ -37,7 +37,7 @@ class AdminAccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
'route' => 'chill_accompanying-course_admin_index', 'route' => 'chill_accompanying-course_admin_index',
]) ])
->setAttribute('class', 'list-group-item-header') ->setAttribute('class', 'list-group-item-header')
->setExtras(['order' => 2200, 'header' => true]); ->setExtras(['order' => 2200]);
$menu->addChild('person_admin.closing motives', [ $menu->addChild('person_admin.closing motives', [
'route' => 'chill_crud_closing_motive_index', 'route' => 'chill_crud_closing_motive_index',
@ -46,7 +46,6 @@ class AdminAccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
$menu->addChild('person_admin.origin', [ $menu->addChild('person_admin.origin', [
'route' => 'chill_crud_origin_index', 'route' => 'chill_crud_origin_index',
])->setExtras(['order' => 2210]); ])->setExtras(['order' => 2210]);
} }
public static function getMenuIds(): array public static function getMenuIds(): array

View File

@ -37,7 +37,7 @@ class AdminHouseholdMenuBuilder implements LocalMenuBuilderInterface
'route' => 'chill_household_admin_index', 'route' => 'chill_household_admin_index',
]) ])
->setAttribute('class', 'list-group-item-header') ->setAttribute('class', 'list-group-item-header')
->setExtras(['order' => 2100, 'header' => true]); ->setExtras(['order' => 2100]);
$menu->addChild('Position', [ $menu->addChild('Position', [
'route' => 'chill_crud_person_household_position_index', 'route' => 'chill_crud_person_household_position_index',
@ -46,7 +46,6 @@ class AdminHouseholdMenuBuilder implements LocalMenuBuilderInterface
$menu->addChild('person_admin.relation', [ $menu->addChild('person_admin.relation', [
'route' => 'chill_crud_person_relation_index', 'route' => 'chill_crud_person_relation_index',
])->setExtras(['order' => 2120]); ])->setExtras(['order' => 2120]);
} }
public static function getMenuIds(): array public static function getMenuIds(): array

View File

@ -37,7 +37,7 @@ class AdminPersonMenuBuilder implements LocalMenuBuilderInterface
'route' => 'chill_person_admin_index', 'route' => 'chill_person_admin_index',
]) ])
->setAttribute('class', 'list-group-item-header') ->setAttribute('class', 'list-group-item-header')
->setExtras(['order' => 2000, 'header' => true]); ->setExtras(['order' => 2000]);
$menu->addChild('Civility', [ $menu->addChild('Civility', [
'route' => 'chill_crud_main_civility_index', 'route' => 'chill_crud_main_civility_index',
@ -50,7 +50,6 @@ class AdminPersonMenuBuilder implements LocalMenuBuilderInterface
$menu->addChild('person_admin.person_resource_kind', [ $menu->addChild('person_admin.person_resource_kind', [
'route' => 'chill_crud_person_resource-kind_index', 'route' => 'chill_crud_person_resource-kind_index',
])->setExtras(['order' => 2030]); ])->setExtras(['order' => 2030]);
} }
public static function getMenuIds(): array public static function getMenuIds(): array

View File

@ -37,7 +37,7 @@ class AdminSocialWorkMenuBuilder implements LocalMenuBuilderInterface
'route' => 'chill_social-work_admin_index', 'route' => 'chill_social-work_admin_index',
]) ])
->setAttribute('class', 'list-group-item-header') ->setAttribute('class', 'list-group-item-header')
->setExtras(['order' => 2300, 'header' => true]); ->setExtras(['order' => 2300]);
$menu->addChild('person_admin.social_action', [ $menu->addChild('person_admin.social_action', [
'route' => 'chill_crud_social_action_index', 'route' => 'chill_crud_social_action_index',

View File

@ -17,7 +17,7 @@ use Symfony\Component\Routing\Annotation\Route;
class AdminController extends AbstractController class AdminController extends AbstractController
{ {
/** /**
* ThirdParty admin * ThirdParty admin.
* *
* @Route("/{_locale}/admin/thirdparty", name="chill_thirdparty_admin_index") * @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'); return $this->render('ChillThirdPartyBundle:Admin:index.html.twig');
} }
}
}

View File

@ -37,7 +37,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
'route' => 'chill_thirdparty_admin_index', 'route' => 'chill_thirdparty_admin_index',
]) ])
->setAttribute('class', 'list-group-item-header') ->setAttribute('class', 'list-group-item-header')
->setExtras(['order' => 3000, 'header' => true]); ->setExtras(['order' => 3000]);
$menu->addChild('Third party category', [ $menu->addChild('Third party category', [
'route' => 'chill_crud_thirdparty_thirdparty-category_index', 'route' => 'chill_crud_thirdparty_thirdparty-category_index',