diff --git a/src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php b/src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php index 5740ad466..a671cf8f2 100644 --- a/src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php +++ b/src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php @@ -284,7 +284,7 @@ class ListCSPerson extends ListPerson implements ListInterface, ExportElementVal 'choices' => $choices, 'data' => $choices, // les checkbox cochés !! - 'choices_as_values' => true, +// 'choices_as_values' => true, 'label' => 'Fields to include in export', 'choice_label' => fn ($key) => str_replace('__', '.', (string) $key), 'choice_attr' => function ($val) { diff --git a/src/Bundle/ChillJobBundle/src/Export/ListCV.php b/src/Bundle/ChillJobBundle/src/Export/ListCV.php index 39504a096..aea1c7217 100644 --- a/src/Bundle/ChillJobBundle/src/Export/ListCV.php +++ b/src/Bundle/ChillJobBundle/src/Export/ListCV.php @@ -92,7 +92,7 @@ class ListCV implements ListInterface, ExportElementValidatedInterface ->add('fields', ChoiceType::class, [ 'multiple' => true, 'expanded' => true, - 'choices_as_values' => true, +// 'choices_as_values' => true, 'label' => 'Fields to include in export', 'choices' => array_combine($this->getFields(), $this->getFields()), 'data' => array_combine($this->getFields(), $this->getFields()), diff --git a/src/Bundle/ChillJobBundle/src/Export/ListFrein.php b/src/Bundle/ChillJobBundle/src/Export/ListFrein.php index 9bf546f55..51354e1fb 100644 --- a/src/Bundle/ChillJobBundle/src/Export/ListFrein.php +++ b/src/Bundle/ChillJobBundle/src/Export/ListFrein.php @@ -105,7 +105,7 @@ class ListFrein implements ListInterface, ExportElementValidatedInterface ->add('fields', ChoiceType::class, [ 'multiple' => true, 'expanded' => true, - 'choices_as_values' => true, +// 'choices_as_values' => true, 'label' => 'Fields to include in export', 'choices' => array_combine($this->getFields(), $this->getFields()), 'data' => array_combine($this->getFields(), $this->getFields()), @@ -187,7 +187,7 @@ class ListFrein implements ListInterface, ExportElementValidatedInterface public function initiateQuery(array $requiredModifiers, array $acl, array $data = []) { return $this->entityManager->createQueryBuilder() - ->from('ChillPersonBundle:Person', 'person'); + ->from(Person::class, 'person'); } /** diff --git a/src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php b/src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php index 52bbc1637..54cd2b3a5 100644 --- a/src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php +++ b/src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php @@ -110,7 +110,7 @@ class ListProjetProfessionnel implements ListInterface, ExportElementValidatedIn ->add('fields', ChoiceType::class, [ 'multiple' => true, 'expanded' => true, - 'choices_as_values' => true, +// 'choices_as_values' => true, 'label' => 'Fields to include in export', 'choice_label' => fn ($key) => str_replace('__', '.', (string) $key), 'choices' => array_combine($this->getFields(), $this->getFields()), diff --git a/src/Bundle/ChillJobBundle/src/Resources/config/services/export.yml b/src/Bundle/ChillJobBundle/src/Resources/config/services/export.yml index e03ca2c37..08bacf6ae 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/config/services/export.yml +++ b/src/Bundle/ChillJobBundle/src/Resources/config/services/export.yml @@ -1,28 +1,20 @@ services: + _defaults: + autowire: true + autoconfigure: true Chill\JobBundle\Export\ListCSPerson: - arguments: - $em: '@doctrine.orm.entity_manager' - $translator: "@translator" - $translatableStringHelper: "@chill.main.helper.translatable_string" - $customFieldProvider: "@chill.custom_field.provider" tags: - { name: chill.export, alias: list_CSPerson } Chill\JobBundle\Export\ListCV: - arguments: - $em: '@doctrine.orm.entity_manager' tags: - { name: chill.export, alias: list_CV } Chill\JobBundle\Export\ListFrein: - arguments: - $em: '@doctrine.orm.entity_manager' tags: - { name: chill.export, alias: list_Frein } Chill\JobBundle\Export\ListProjetProfessionnel: - arguments: - $em: '@doctrine.orm.entity_manager' tags: - { name: chill.export, alias: list_ProjetProfessionnel }