Merge branch 'develop' of https://forge.laclic.fr/Laclic/SovBundle into develop

Controller/AbstractAdminController.php

@@ -63,14 +63,14 @@ abstract class AbstractAdminController extends EaAbstractCrudController
     public static function getSubscribedServices()
     {
         return array_merge(
-                parent::getSubscribedServices(),
-                [
-                        'session' => SessionInterface::class,
-                        'request' => RequestStack::class,
-                        'em' => EntityManagerInterface::class,
-                        'translator_admin' => TranslatorAdmin::class,
-                        'filter_manager' => FilterManager::class,
-                ]
+            parent::getSubscribedServices(),
+            [
+                'session' => SessionInterface::class,
+                'request' => RequestStack::class,
+                'em' => EntityManagerInterface::class,
+                'translator_admin' => TranslatorAdmin::class,
+                'filter_manager' => FilterManager::class,
+            ]
         );
     }
 
@@ -113,9 +113,9 @@ abstract class AbstractAdminController extends EaAbstractCrudController
                     if ($entity !== null) {
                         if ($entity->getParent() !== null) {
                             $url = $adminUrlGenerator
-                                    ->setController($context->getCrud()->getControllerFqcn())
-                                    ->set('entityId', $entity->getParent()->getId())
-                                    ->generateUrl();
+                                ->setController($context->getCrud()->getControllerFqcn())
+                                ->set('entityId', $entity->getParent()->getId())
+                                ->generateUrl();
                             $action->setLinkUrl($url);
                         }
                     } else {
@@ -127,10 +127,10 @@ abstract class AbstractAdminController extends EaAbstractCrudController
                     $entityId = $context->getRequest()->get('entityId');
                     if ($entityId != null) {
                         $url = $adminUrlGenerator
-                                ->setController($context->getCrud()->getControllerFqcn())
-                                ->setAction($action->getName())
-                                ->set('entityId', $entityId)
-                                ->generateUrl();
+                            ->setController($context->getCrud()->getControllerFqcn())
+                            ->setAction($action->getName())
+                            ->set('entityId', $entityId)
+                            ->generateUrl();
                         $action->setLinkUrl($url);
                     }
                 }
@@ -155,14 +155,14 @@ abstract class AbstractAdminController extends EaAbstractCrudController
     {
         $entityClass = $this->getEntityFqcn();
         $paramListMaxResults = 'listMaxResults';
-        $paramSessionListMaxResults = $entityClass.'-'.$paramListMaxResults;
+        $paramSessionListMaxResults = $entityClass . '-' . $paramListMaxResults;
         $requestListMaxResults = $this->get('request')->getCurrentRequest()->get($paramListMaxResults);
 
         if ($requestListMaxResults) {
             $this->get('session')->set($paramSessionListMaxResults, $requestListMaxResults);
         }
         $maxResults = $this->get('session')->get($paramSessionListMaxResults) ? $this->get('session')->get(
-                $paramSessionListMaxResults
+            $paramSessionListMaxResults
         ) : 30;
 
         $crud->setPaginatorPageSize($maxResults);
@@ -172,17 +172,17 @@ abstract class AbstractAdminController extends EaAbstractCrudController
     {
         if ($this->isInstanceOf(SeoInterface::class)) {
             return [
-                    FormField::addPanel('seo')->setTemplateName('crud/field/generic'),
-                    TextField::new('metaTitle')->setLabel('Meta Title')->setHelp(
-                            'Affiché dans les résultats de recherche Google'
-                    )->hideOnIndex(),
-                    TextareaField::new('metaDescription')->setLabel('Meta description')->setHelp(
-                            'Affiché dans les résultats de recherche Google'
+                FormField::addPanel('seo')->setTemplateName('crud/field/generic'),
+                TextField::new('metaTitle')->setLabel('Meta Title')->setHelp(
+                    'Affiché dans les résultats de recherche Google'
+                )->hideOnIndex(),
+                TextareaField::new('metaDescription')->setLabel('Meta description')->setHelp(
+                    'Affiché dans les résultats de recherche Google'
+                )->hideOnIndex(),
+                CollectionField::new('oldUrls')
+                    ->setFormTypeOption('entry_type', TextType::class)->setLabel(
+                        'Anciennes urls du document'
                     )->hideOnIndex(),
-                    CollectionField::new('oldUrls')
-                            ->setFormTypeOption('entry_type', TextType::class)->setLabel(
-                                    'Anciennes urls du document'
-                            )->hideOnIndex(),
             ];
         } else {
             return null;
@@ -193,13 +193,12 @@ abstract class AbstractAdminController extends EaAbstractCrudController
     {
         if ($this->isInstanceOf(DevAliasInterface::class)) {
             return [
-                    FormField::addPanel('configuration')->setTemplateName('crud/field/generic'),
-                    TextField::new('devAlias')->hideOnIndex(),
+                FormField::addPanel('configuration')->setTemplateName('crud/field/generic'),
+                TextField::new('devAlias')->hideOnIndex(),
             ];
-        }else{
+        } else {
             return null;
         }
-
     }
 
     public function sort(AdminContext $context)
@@ -217,9 +216,9 @@ abstract class AbstractAdminController extends EaAbstractCrudController
 
         $fields = FieldCollection::new($this->configureFields(Crud::PAGE_INDEX));
         $filters = $this->get(FilterFactory::class)->create(
-                $context->getCrud()->getFiltersConfig(),
-                $fields,
-                $context->getEntity()
+            $context->getCrud()->getFiltersConfig(),
+            $fields,
+            $context->getEntity()
         );
         $queryBuilder = $this->createIndexQueryBuilder($context->getSearch(), $context->getEntity(), $fields, $filters);
         $paginator = $this->get(PaginatorFactory::class)->create($queryBuilder);
@@ -228,16 +227,16 @@ abstract class AbstractAdminController extends EaAbstractCrudController
         $this->get(EntityFactory::class)->processFieldsForAll($entities, $fields);
 
         $sortableForm = $this->createFormBuilder(array('entities', $paginator->getResults()))
-                ->add(
-                        'entities',
-                        CollectionType::class,
-                        array(
-                                'required' => true,
-                                'allow_add' => true,
-                                'entry_type' => PositionType::class,
-                        )
+            ->add(
+                'entities',
+                CollectionType::class,
+                array(
+                    'required' => true,
+                    'allow_add' => true,
+                    'entry_type' => PositionType::class,
                 )
-                ->getForm();
+            )
+            ->getForm();
 
         $entityManager = $this->getDoctrine()->getManagerForClass($this->getEntityFqcn());
         $repository = $entityManager->getRepository($this->getEntityFqcn());
@@ -264,26 +263,26 @@ abstract class AbstractAdminController extends EaAbstractCrudController
             }
 
             $url = $this->get(AdminUrlGenerator::class)
-                    ->setAction(Action::INDEX)
-                    ->generateUrl();
+                ->setAction(Action::INDEX)
+                ->generateUrl();
             $this->addFlash('success', $this->translatorAdmin->transFlashMessage('sort'), array());
 
             return $this->redirect($url);
         }
 
         $responseParameters = $this->configureResponseParameters(
-                KeyValueStore::new(
-                        [
-                                'pageName' => Crud::PAGE_INDEX,
-                                'templatePath' => '@LcSov/adminlte/crud/sort.html.twig',
-                                'entities' => $entities,
-                                'paginator' => $paginator,
-                                'global_actions' => array(),
-                                'batch_actions' => array(),
-                                'filters' => $filters,
-                                'sortable_form' => $sortableForm,
-                        ]
-                )
+            KeyValueStore::new(
+                [
+                    'pageName' => Crud::PAGE_INDEX,
+                    'templatePath' => '@LcSov/adminlte/crud/sort.html.twig',
+                    'entities' => $entities,
+                    'paginator' => $paginator,
+                    'global_actions' => array(),
+                    'batch_actions' => array(),
+                    'filters' => $filters,
+                    'sortable_form' => $sortableForm,
+                ]
+            )
         );
         $responseParameters->set('fields', $this->configureFields('index'));
         $event = new AfterCrudActionEvent($context, $responseParameters);
@@ -296,16 +295,16 @@ abstract class AbstractAdminController extends EaAbstractCrudController
     }
 
     public function createIndexQueryBuilder(
-            SearchDto $searchDto,
-            EntityDto $entityDto,
-            FieldCollection $fields,
-            FilterCollection $filters
+        SearchDto $searchDto,
+        EntityDto $entityDto,
+        FieldCollection $fields,
+        FilterCollection $filters
     ): QueryBuilder {
         $queryBuilder = parent::createIndexQueryBuilder(
-                $searchDto,
-                $entityDto,
-                $fields,
-                $filters
+            $searchDto,
+            $entityDto,
+            $fields,
+            $filters
         );
 
         //TOdo utiliser les repositoryQuery ?
@@ -320,14 +319,14 @@ abstract class AbstractAdminController extends EaAbstractCrudController
         }
 
         $this->filtersForm = $this->createForm(
-                FiltersFormType::class,
-                null,
-                array(
-                        'fields' => $fields,
-                        'entity_dto' => $entityDto,
-                        'entity_class' => $this->getEntityFqcn(),
-                        'entity_name' => $entityDto->getName(),
-                )
+            FiltersFormType::class,
+            null,
+            array(
+                'fields' => $fields,
+                'entity_dto' => $entityDto,
+                'entity_class' => $this->getEntityFqcn(),
+                'entity_name' => $entityDto->getName(),
+            )
         );
 
         $filterManager = $this->get('filter_manager');
@@ -343,10 +342,10 @@ abstract class AbstractAdminController extends EaAbstractCrudController
     }
 
     public function createSortQueryBuilder(
-            SearchDto $searchDto,
-            EntityDto $entityDto,
-            FieldCollection $fields,
-            FilterCollection $filters
+        SearchDto $searchDto,
+        EntityDto $entityDto,
+        FieldCollection $fields,
+        FilterCollection $filters
     ): QueryBuilder {
         $queryBuilder = $this->createIndexQueryBuilder($searchDto, $entityDto, $fields, $filters);
 
@@ -375,7 +374,7 @@ abstract class AbstractAdminController extends EaAbstractCrudController
         $context = $this->get(AdminContextProvider::class)->getContext();
 
         return $context->getCrudControllers()->findCrudFqcnByEntityFqcn(
-                $this->get('em')->getEntityName($interface)
+            $this->get('em')->getEntityName($interface)
         );
     }
 
@@ -411,66 +410,66 @@ abstract class AbstractAdminController extends EaAbstractCrudController
     public function buildIndexActions(Actions $actions): void
     {
         $this->actionUpdate(
-                $actions,
-                Crud::PAGE_INDEX,
-                Action::NEW,
-                [
-                        'icon' => 'plus',
-                        'label' => $this->get('translator_admin')->transAction('create'),
-                        'add_class' => 'btn-sm',
-                ]
+            $actions,
+            Crud::PAGE_INDEX,
+            Action::NEW,
+            [
+                'icon' => 'plus',
+                'label' => $this->get('translator_admin')->transAction('create'),
+                'add_class' => 'btn-sm',
+            ]
         );
 
         $this->actionUpdate(
-                $actions,
-                Crud::PAGE_INDEX,
-                Action::EDIT,
-                [
-                        'class' => 'btn btn-sm btn-primary',
-                        'icon' => 'edit',
-                        'label' => false,
-                        'html_attributes' => array(
-                                'data-toggle' => 'tooltip',
-                                'title' => $this->get('translator_admin')->transAction('edit'),
-                        ),
-                ]
+            $actions,
+            Crud::PAGE_INDEX,
+            Action::EDIT,
+            [
+                'class' => 'btn btn-sm btn-primary',
+                'icon' => 'edit',
+                'label' => false,
+                'html_attributes' => array(
+                    'data-toggle' => 'tooltip',
+                    'title' => $this->get('translator_admin')->transAction('edit'),
+                ),
+            ]
         );
 
         $this->actionUpdate(
-                $actions,
-                Crud::PAGE_INDEX,
-                Action::DETAIL,
-                [
-                        'icon' => 'eye',
-                        'add_class' => 'btn btn-sm btn-success',
-                        'label' => false,
-                        'html_attributes' => array(
-                                'data-toggle' => 'tooltip',
-                                'title' => $this->get('translator_admin')->transAction('detail'),
-                        ),
-                ]
+            $actions,
+            Crud::PAGE_INDEX,
+            Action::DETAIL,
+            [
+                'icon' => 'eye',
+                'add_class' => 'btn btn-sm btn-success',
+                'label' => false,
+                'html_attributes' => array(
+                    'data-toggle' => 'tooltip',
+                    'title' => $this->get('translator_admin')->transAction('detail'),
+                ),
+            ]
         );
 
         $this->actionUpdate(
-                $actions,
-                Crud::PAGE_INDEX,
-                Action::DELETE,
-                [
-                        'icon' => 'trash',
-                        'dropdown' => true,
-                        'label' => $this->get('translator_admin')->transAction('delete'),
-                ]
+            $actions,
+            Crud::PAGE_INDEX,
+            Action::DELETE,
+            [
+                'icon' => 'trash',
+                'dropdown' => true,
+                'label' => $this->get('translator_admin')->transAction('delete'),
+            ]
         );
 
         $this->actionUpdate(
-                $actions,
-                Crud::PAGE_INDEX,
-                Action::BATCH_DELETE,
-                [
-                        'class' => 'btn btn-sm btn-danger',
-                        'icon' => 'trash',
-                        'label' => $this->get('translator_admin')->transAction('delete'),
-                ]
+            $actions,
+            Crud::PAGE_INDEX,
+            Action::BATCH_DELETE,
+            [
+                'class' => 'btn btn-sm btn-danger',
+                'icon' => 'trash',
+                'label' => $this->get('translator_admin')->transAction('delete'),
+            ]
         );
     }
 
@@ -482,47 +481,47 @@ abstract class AbstractAdminController extends EaAbstractCrudController
 
 
         $this->actionUpdate(
-                $actions,
-                Crud::PAGE_EDIT,
-                Action::SAVE_AND_RETURN,
-                [
-                        'add_class' => 'float-right',
-                        'icon' => 'check',
-                        'label' => $this->get('translator_admin')->transAction('save_and_return'),
-                ]
+            $actions,
+            Crud::PAGE_EDIT,
+            Action::SAVE_AND_RETURN,
+            [
+                'add_class' => 'float-right',
+                'icon' => 'check',
+                'label' => $this->get('translator_admin')->transAction('save_and_return'),
+            ]
         );
 
         $this->actionUpdate(
-                $actions,
-                Crud::PAGE_EDIT,
-                Action::INDEX,
-                [
-                        'icon' => 'chevron-left',
-                        'class' => 'btn btn-link',
-                        'label' => $this->get('translator_admin')->transAction('back_index'),
-                ]
+            $actions,
+            Crud::PAGE_EDIT,
+            Action::INDEX,
+            [
+                'icon' => 'chevron-left',
+                'class' => 'btn btn-link',
+                'label' => $this->get('translator_admin')->transAction('back_index'),
+            ]
         );
 
 
         $this->actionUpdate(
-                $actions,
-                Crud::PAGE_EDIT,
-                Action::SAVE_AND_CONTINUE,
-                [
-                        'class' => 'btn btn-info float-right',
-                        'label' => $this->get('translator_admin')->transAction('save_and_continue'),
-                ]
+            $actions,
+            Crud::PAGE_EDIT,
+            Action::SAVE_AND_CONTINUE,
+            [
+                'class' => 'btn btn-info float-right',
+                'label' => $this->get('translator_admin')->transAction('save_and_continue'),
+            ]
         );
 
         $this->actionUpdate(
-                $actions,
-                Crud::PAGE_EDIT,
-                Action::DELETE,
-                [
-                        'icon' => 'trash',
-                        'class' => 'btn btn-outline-danger action-delete',
-                        'label' => $this->get('translator_admin')->transAction('delete'),
-                ]
+            $actions,
+            Crud::PAGE_EDIT,
+            Action::DELETE,
+            [
+                'icon' => 'trash',
+                'class' => 'btn btn-outline-danger action-delete',
+                'label' => $this->get('translator_admin')->transAction('delete'),
+            ]
         );
     }
 
@@ -535,35 +534,35 @@ abstract class AbstractAdminController extends EaAbstractCrudController
         $actions->add(Crud::PAGE_NEW, Action::INDEX);
 
         $this->actionUpdate(
-                $actions,
-                Crud::PAGE_EDIT,
-                Action::SAVE_AND_RETURN,
-                [
-                        'add_class' => 'float-right',
-                        'icon' => 'check',
-                        'label' => $this->get('translator_admin')->transAction('save_and_return'),
-                ]
+            $actions,
+            Crud::PAGE_EDIT,
+            Action::SAVE_AND_RETURN,
+            [
+                'add_class' => 'float-right',
+                'icon' => 'check',
+                'label' => $this->get('translator_admin')->transAction('save_and_return'),
+            ]
         );
 
         $this->actionUpdate(
-                $actions,
-                Crud::PAGE_EDIT,
-                Action::INDEX,
-                [
-                        'icon' => 'chevron-left',
-                        'class' => 'btn btn-link',
-                        'label' => $this->get('translator_admin')->transAction('back_index'),
-                ]
+            $actions,
+            Crud::PAGE_EDIT,
+            Action::INDEX,
+            [
+                'icon' => 'chevron-left',
+                'class' => 'btn btn-link',
+                'label' => $this->get('translator_admin')->transAction('back_index'),
+            ]
         );
 
         $this->actionUpdate(
-                $actions,
-                Crud::PAGE_EDIT,
-                Action::SAVE_AND_ADD_ANOTHER,
-                [
-                        'class' => 'btn btn-info float-right',
-                        'label' => $this->get('translator_admin')->transAction('save_and_add_another'),
-                ]
+            $actions,
+            Crud::PAGE_EDIT,
+            Action::SAVE_AND_ADD_ANOTHER,
+            [
+                'class' => 'btn btn-info float-right',
+                'label' => $this->get('translator_admin')->transAction('save_and_add_another'),
+            ]
         );
     }
 
@@ -571,13 +570,13 @@ abstract class AbstractAdminController extends EaAbstractCrudController
     {
         if ($this->isInstanceOf(TranslatableInterface::class)) {
             $actions->update(
-                    Crud::PAGE_INDEX,
-                    Action::EDIT,
-                    function (Action $action) {
-                        $action->setTemplatePath('@LcSov/adminlte/crud/action/translatable.html.twig');
+                Crud::PAGE_INDEX,
+                Action::EDIT,
+                function (Action $action) {
+                    $action->setTemplatePath('@LcSov/adminlte/crud/action/translatable.html.twig');
 
-                        return $action;
-                    }
+                    return $action;
+                }
             );
         }
     }
@@ -586,9 +585,9 @@ abstract class AbstractAdminController extends EaAbstractCrudController
     {
         if ($this->isInstanceOf(SortableInterface::class)) {
             $sortAction = Action::new('sort', $this->get('translator_admin')->transAction('sort'), 'fa fa-sort')
-                    ->linkToCrudAction('sort')
-                    ->setCssClass('btn btn-sm btn-success')
-                    ->createAsGlobalAction();
+                ->linkToCrudAction('sort')
+                ->setCssClass('btn btn-sm btn-success')
+                ->createAsGlobalAction();
 
             $actions->add(Crud::PAGE_INDEX, $sortAction);
         }
@@ -599,24 +598,24 @@ abstract class AbstractAdminController extends EaAbstractCrudController
     {
         if ($this->isInstanceOf(TreeInterface::class)) {
             $indexChildAction = Action::new(
-                    'index_children',
-                    $this->get('translator_admin')->transAction('index_children'),
-                    'fa fa-list'
+                'index_children',
+                $this->get('translator_admin')->transAction('index_children'),
+                'fa fa-list'
             )
-                    ->linkToCrudAction(Action::INDEX)
-                    ->setLabel('')
-                    ->setHtmlAttributes(array('data-toggle' => 'tooltip', 'title' => 'Afficher les enfants'))
-                    ->setTemplatePath('@LcSov/adminlte/crud/action/index_children.html.twig')
-                    ->setCssClass('btn btn-sm btn-success');
+                ->linkToCrudAction(Action::INDEX)
+                ->setLabel('')
+                ->setHtmlAttributes(array('data-toggle' => 'tooltip', 'title' => 'Afficher les enfants'))
+                ->setTemplatePath('@LcSov/adminlte/crud/action/index_children.html.twig')
+                ->setCssClass('btn btn-sm btn-success');
 
             $backParentAction = Action::new(
-                    'index_parent',
-                    $this->get('translator_admin')->transAction('index_parent'),
-                    'fa fa-chevron-left'
+                'index_parent',
+                $this->get('translator_admin')->transAction('index_parent'),
+                'fa fa-chevron-left'
             )
-                    ->linkToCrudAction(Action::INDEX)
-                    ->setCssClass('btn btn-sm btn-info')
-                    ->createAsGlobalAction();
+                ->linkToCrudAction(Action::INDEX)
+                ->setCssClass('btn btn-sm btn-info')
+                ->createAsGlobalAction();
 
             $actions->add(Crud::PAGE_INDEX, $backParentAction);
             $actions->add(Crud::PAGE_INDEX, $indexChildAction);
@@ -627,35 +626,35 @@ abstract class AbstractAdminController extends EaAbstractCrudController
     {
         if ($actions->getAsDto('actions')->getAction($crudActionName, $actionName)) {
             $actions->update(
-                    $crudActionName,
-                    $actionName,
-                    function (Action $action) use ($button) {
-                        if (isset($button['add_class'])) {
-                            $action->addCssClass($button['add_class']);
-                        }
-
-                        if (isset($button['class'])) {
-                            $action->setCssClass($button['class']);
-                        }
+                $crudActionName,
+                $actionName,
+                function (Action $action) use ($button) {
+                    if (isset($button['add_class'])) {
+                        $action->addCssClass($button['add_class']);
+                    }
 
-                        if (isset($button['icon'])) {
-                            $action->setIcon('fa fa-'.$button['icon']);
-                        }
+                    if (isset($button['class'])) {
+                        $action->setCssClass($button['class']);
+                    }
 
-                        if (isset($button['label'])) {
-                            $action->setLabel($button['label']);
-                        }
+                    if (isset($button['icon'])) {
+                        $action->setIcon('fa fa-' . $button['icon']);
+                    }
 
-                        if (isset($button['dropdown']) && $button['dropdown']) {
-                            $action->addCssClass('in-dropdown');
-                        }
+                    if (isset($button['label'])) {
+                        $action->setLabel($button['label']);
+                    }
 
-                        if (isset($button['html_attributes']) && $button['html_attributes']) {
-                            $action->setHtmlAttributes($button['html_attributes']);
-                        }
+                    if (isset($button['dropdown']) && $button['dropdown']) {
+                        $action->addCssClass('in-dropdown');
+                    }
 
-                        return $action;
+                    if (isset($button['html_attributes']) && $button['html_attributes']) {
+                        $action->setHtmlAttributes($button['html_attributes']);
                     }
+
+                    return $action;
+                }
             );
         }
     }
@@ -663,22 +662,22 @@ abstract class AbstractAdminController extends EaAbstractCrudController
     public function autocompleteFilter(AdminContext $context): JsonResponse
     {
         $queryBuilder = $this->createIndexQueryBuilder(
-                $context->getSearch(),
-                $context->getEntity(),
-                FieldCollection::new([]),
-                FilterCollection::new()
+            $context->getSearch(),
+            $context->getEntity(),
+            FieldCollection::new([]),
+            FilterCollection::new()
         );
         $autocompleteContext = $context->getRequest()->get(AssociationField::PARAM_AUTOCOMPLETE_CONTEXT);
 
         /** @var CrudControllerInterface $controller */
         $controller = $this->get(ControllerFactory::class)->getCrudControllerInstance(
-                $autocompleteContext[EA::CRUD_CONTROLLER_FQCN],
-                Action::INDEX,
-                $context->getRequest()
+            $autocompleteContext[EA::CRUD_CONTROLLER_FQCN],
+            Action::INDEX,
+            $context->getRequest()
         );
         /** @var FieldDto $field */
         $field = FieldCollection::new(
-                $controller->configureFields($autocompleteContext['originatingPage'])
+            $controller->configureFields($autocompleteContext['originatingPage'])
         )->getByProperty($autocompleteContext['propertyName']);
 
         $filterManager = $this->get('filter_manager');
@@ -687,7 +686,7 @@ abstract class AbstractAdminController extends EaAbstractCrudController
         if ($filterManager->isRelationField($field->getProperty())) {
             $queryBuilder->select($autocompleteContext['propertyName']);
         } else {
-            $queryBuilder->select('entity.'.$autocompleteContext['propertyName']);
+            $queryBuilder->select('entity.' . $autocompleteContext['propertyName']);
         }
 
         $responses = array();

Field/BooleanField.php

@@ -4,9 +4,7 @@ namespace Lc\SovBundle\Field;
 
 use EasyCorp\Bundle\EasyAdminBundle\Contracts\Field\FieldInterface;
 use EasyCorp\Bundle\EasyAdminBundle\Field\FieldTrait;
-use Lc\SovBundle\Form\Type\FileManagerType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 /**
@@ -21,7 +19,7 @@ final class BooleanField implements FieldInterface
                 return (new self())
                         ->setProperty($propertyName)
                         ->setLabel($label)
-                        ->setTemplatePath('@LcSov/adminlte/crud/field/toggle.html.twig')
+                        ->setTemplatePath('@LcSov/adminlte/crud/field/boolean.html.twig')
                         ->setFormType(CheckboxType::class);
         }
 

Field/CollectionField.php

@@ -11,69 +11,68 @@ use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 
 class CollectionField implements FieldInterface
 {
-        use FieldTrait;
-
-        public const OPTION_ALLOW_ADD = 'allowAdd';
-        public const OPTION_ALLOW_DELETE = 'allowDelete';
-        public const OPTION_ENTRY_IS_COMPLEX = 'entryIsComplex';
-        public const OPTION_ENTRY_TYPE = 'entryType';
-        public const OPTION_SHOW_ENTRY_LABEL = 'showEntryLabel';
-
-        public static function new(string $propertyName, ?string $label = null): self
-        {
-                return (new self())
-                        ->setProperty($propertyName)
-                        ->setLabel($label)
-                        ->setTemplatePath('@LcSov/adminlte/crud/field/collection.html.twig')
-                        ->setFormType(CollectionType::class)
-                        /*->addWebpackEncoreEntries('adminlte-field-collection')*/
-                        ->setFormTypeOption('allow_add', true)
-                        ->setFormTypeOption('allow_delete', true)
-                        ->setFormTypeOption('entry_options', array('label' => false))
-                        ->addCssClass('field-collection')
-                        ->setFormTypeOption('attr', array('class' => 'field-collection-group'))
-
-                        //Fixe le bug easyadmin lors de la gestion d'un champ de type array, laisser a false pour une entité
-                        ->setFormTypeOption('row_attr', array('data-reindex-key' => true));
-
-        }
-
-        public function allowAdd(bool $allow = true): self
-        {
-                $this->setCustomOption(self::OPTION_ALLOW_ADD, $allow);
-
-                return $this;
-        }
-
-        public function allowDelete(bool $allow = true): self
-        {
-                $this->setCustomOption(self::OPTION_ALLOW_DELETE, $allow);
-
-                return $this;
-        }
-
-        /**
-         * Set this option to TRUE if the collection items are complex form types
-         * composed of several form fields (EasyAdmin applies a special rendering to make them look better).
-         */
-        public function setEntryIsComplex(bool $isComplex): self
-        {
-                $this->setCustomOption(self::OPTION_ENTRY_IS_COMPLEX, $isComplex);
-
-                return $this;
-        }
-
-        public function setEntryType(string $formTypeFqcn): self
-        {
-                $this->setCustomOption(self::OPTION_ENTRY_TYPE, $formTypeFqcn);
-
-                return $this;
-        }
-
-        public function showEntryLabel(bool $showLabel = true): self
-        {
-                $this->setCustomOption(self::OPTION_SHOW_ENTRY_LABEL, $showLabel);
-
-                return $this;
-        }
+    use FieldTrait;
+
+    public const OPTION_ALLOW_ADD = 'allowAdd';
+    public const OPTION_ALLOW_DELETE = 'allowDelete';
+    public const OPTION_ENTRY_IS_COMPLEX = 'entryIsComplex';
+    public const OPTION_ENTRY_TYPE = 'entryType';
+    public const OPTION_SHOW_ENTRY_LABEL = 'showEntryLabel';
+
+    public static function new(string $propertyName, ?string $label = null): self
+    {
+        return (new self())
+            ->setProperty($propertyName)
+            ->setLabel($label)
+            ->setTemplatePath('@LcSov/adminlte/crud/field/collection.html.twig')
+            ->setFormType(CollectionType::class)
+            /*->addWebpackEncoreEntries('adminlte-field-collection')*/
+            ->setFormTypeOption('allow_add', true)
+            ->setFormTypeOption('allow_delete', true)
+            ->setFormTypeOption('entry_options', array('label' => false))
+            ->addCssClass('field-collection')
+            ->setFormTypeOption('attr', array('class' => 'field-collection-group'))
+
+            //Fixe le bug easyadmin lors de la gestion d'un champ de type array, laisser a false pour une entité
+            ->setFormTypeOption('row_attr', array('data-reindex-key' => true));
+    }
+
+    public function allowAdd(bool $allow = true): self
+    {
+        $this->setCustomOption(self::OPTION_ALLOW_ADD, $allow);
+
+        return $this;
+    }
+
+    public function allowDelete(bool $allow = true): self
+    {
+        $this->setCustomOption(self::OPTION_ALLOW_DELETE, $allow);
+
+        return $this;
+    }
+
+    /**
+     * Set this option to TRUE if the collection items are complex form types
+     * composed of several form fields (EasyAdmin applies a special rendering to make them look better).
+     */
+    public function setEntryIsComplex(bool $isComplex): self
+    {
+        $this->setCustomOption(self::OPTION_ENTRY_IS_COMPLEX, $isComplex);
+
+        return $this;
+    }
+
+    public function setEntryType(string $formTypeFqcn): self
+    {
+        $this->setCustomOption(self::OPTION_ENTRY_TYPE, $formTypeFqcn);
+
+        return $this;
+    }
+
+    public function showEntryLabel(bool $showLabel = true): self
+    {
+        $this->setCustomOption(self::OPTION_SHOW_ENTRY_LABEL, $showLabel);
+
+        return $this;
+    }
 }

Field/StatusField.php

@@ -4,9 +4,7 @@ namespace Lc\SovBundle\Field;
 
 use EasyCorp\Bundle\EasyAdminBundle\Contracts\Field\FieldInterface;
 use EasyCorp\Bundle\EasyAdminBundle\Field\FieldTrait;
-use Lc\SovBundle\Form\Type\FileManagerType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 /**
  * @author La clic ! <contact@laclic.fr>
@@ -31,7 +29,6 @@ final class StatusField implements FieldInterface
         if (!$templateToggle) {
             $template = 'status.html.twig';
         }
-
         $field->setTemplatePath('@LcSov/adminlte/crud/field/' . $template);
 
         return $field;

Field/ToggleField.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Lc\SovBundle\Field;
+
+use EasyCorp\Bundle\EasyAdminBundle\Contracts\Field\FieldInterface;
+use EasyCorp\Bundle\EasyAdminBundle\Field\FieldTrait;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+
+/**
+ * @author La clic ! <contact@laclic.fr>
+ */
+final class ToggleField implements FieldInterface
+{
+        use FieldTrait;
+
+        public static function new(string $propertyName, ?string $label = null): self
+        {
+                return (new self())
+                        ->setProperty($propertyName)
+                        ->setLabel($label)
+                        ->setTemplatePath('@LcSov/adminlte/crud/field/toggle.html.twig')
+                        ->setFormType(CheckboxType::class);
+        }
+
+}

Resources/assets/app/adminlte/main/scss/_common.scss

@@ -3,8 +3,8 @@ nav.main-header {
   ul.navbar-nav {
     li.nav-item-user-menu {
       .dropdown-menu {
-        position: absolute ;
-        z-index: 1000 ;
+        position: absolute;
+        z-index: 1000;
       }
     }
 
@@ -16,4 +16,16 @@ nav.main-header {
       }
     }
   }
+}
+
+.main-sidebar p {
+  font-size: 0.8rem;
+}
+
+.nav-link {
+  padding: 0.5rem 0.5rem;
+}
+
+.nav-treeview .nav-link {
+  padding: 0.2rem 0.5rem 0.2rem 1.2rem;
 }

Resources/assets/functions/widgets.js

@@ -22,9 +22,7 @@ export class SovWidgets {
                         if ($select.find('option[value=""]')) {
                                 options.placeholder = $select.find('option[value=""]').html()
                         }
-                        /*if($select.is(':required') == false) {
-                            options.allowclear = true
-                        }*/
+
                         var myselect = $select.select2(options);
 
                         myselect.on('select2:select', function (e) {

Resources/views/adminlte/crud/field/association_many.html.twig

@@ -0,0 +1,3 @@
+{% for entity in field.value %}
+    <span class="badge badge-secondary">{{ entity }}</span>
+{% endfor %}

Resources/views/adminlte/crud/field/boolean.html.twig

@@ -0,0 +1,5 @@
+{% if field.value %}
+    <span class="badge badge-success">Oui</span>
+{% else %}
+    <span class="badge badge-danger">Non</span>
+{% endif %}

Resources/views/adminlte/crud/field/status.html.twig

@@ -1,4 +1,3 @@
-
 {% if field.value == 1 %}
     <div class="badge badge-success">En ligne</div>
 {% else %}

Resources/views/adminlte/crud/field/toggle.html.twig

@@ -1,6 +1,6 @@
 {% set item = entity.instance %}
 {% set property_name = field.getProperty() %}
-{% set id_toggle = 'toogle-'~item.id~'-'~property_name %}
+{% set id_toggle = 'toggle-'~item.id~'-'~property_name %}
 
 <div class="custom-control custom-switch custom-switch-on-success custom-switch-off-default"
      data-url="{{ ea_url({crudAction: 'edit', entityId: item.id, fieldName: property_name }) }}">

Resources/views/adminlte/crud/index.html.twig

@@ -131,27 +131,28 @@
 
                                         {% block entity_actions %}
                                             <td class="actions text-right">
-                                                {% set in_dropdown_class = 'in-dropdown' %}
-                                                {% for action in entity.actions %}
-                                                    {% if not (in_dropdown_class in action.cssClass) %}
-                                                        {{ include(action.templatePath, { action: action, entity: entity, isIncludedInDropdown: 0 }, with_context = false) }}
-                                                    {% endif %}
-                                                {% endfor %}
-
-                                                <div class="dropdown dropdown-actions">
-                                                    <a class="dropdown-toggle btn btn-secondary btn-sm" href="#"
-                                                       role="button" data-toggle="dropdown" aria-haspopup="true"
-                                                       aria-expanded="false">
-                                                    </a>
-
-                                                    <div class="dropdown-menu dropdown-menu-right">
-                                                        {% for action in entity.actions %}
-                                                            {% if in_dropdown_class in action.cssClass %}
-                                                                {{ include(action.templatePath, { action: action, isIncludedInDropdown: 1 }, with_context = false) }}
-                                                            {% endif %}
-                                                        {% endfor %}
+                                                {% if entity.actions.count > 0 %}
+                                                    {% set in_dropdown_class = 'in-dropdown' %}
+                                                    {% for action in entity.actions %}
+                                                        {% if not (in_dropdown_class in action.cssClass) %}
+                                                            {{ include(action.templatePath, { action: action, entity: entity, isIncludedInDropdown: 0 }, with_context = false) }}
+                                                        {% endif %}
+                                                    {% endfor %}
+                                                    <div class="dropdown dropdown-actions">
+                                                        <a class="dropdown-toggle btn btn-secondary btn-sm" href="#"
+                                                           role="button" data-toggle="dropdown" aria-haspopup="true"
+                                                           aria-expanded="false">
+                                                        </a>
+
+                                                        <div class="dropdown-menu dropdown-menu-right">
+                                                            {% for action in entity.actions %}
+                                                                {% if in_dropdown_class in action.cssClass %}
+                                                                    {{ include(action.templatePath, { action: action, isIncludedInDropdown: 1 }, with_context = false) }}
+                                                                {% endif %}
+                                                            {% endfor %}
+                                                        </div>
                                                     </div>
-                                                </div>
+                                                {% endif %}
 
                                                 {% if not ea.crud.showEntityActionsAsDropdown %}
 
@@ -187,13 +188,13 @@
                         {% if filters_form is defined %}
                             {{ form_start(filters_form, {'attr' :{'id' : 'filters-form'}}) }}
 
-                            {#<input type="hidden" name="entity" value="{{ _entity_config.name }}">
+                            {# <input type="hidden" name="entity" value="{{ _entity_config.name }}">
                         <input type="hidden" name="menuIndex" value="{{ app.request.get('menuIndex') }}">
                         <input type="hidden" name="submenuIndex" value="{{ app.request.get('submenuIndex') }}">
                         <input type="hidden" name="sortField" value="{{ app.request.get('sortField', '') }}">
                         <input type="hidden" name="sortDirection"
                                value="{{ app.request.get('sortDirection', 'DESC') }}">
-                        <input type="hidden" name="action" value="{{ app.request.get('action') }}">#}
+                        <input type="hidden" name="action" value="{{ app.request.get('action') }}"> #}
                             {{ form_end(filters_form) }}
                         {% endif %}
                     {% endblock filters_form %}
@@ -243,7 +244,7 @@
                        });
                });*/
 
-          /*  {% if filters|length > 0 %}
+            /*  {% if filters|length > 0 %}
             const filterModal = document.querySelector('#modal-filters');
 
             const removeFilter = function (field) {