Merge pull request #271 from jolicode/fix/conferences-select-lists

fix: limit conferences selects to future conferences
jolicode · Oct 24, 2022 · b1a3b4a · b1a3b4a
2 parents eec6558 + 2cc8813
commit b1a3b4a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/config/packages/easy_admin/participation.yaml b/config/packages/easy_admin/participation.yaml
@@ -21,7 +21,7 @@ easy_admin:
                 item_permission: ['ROLE_PARTICIPATION_MANAGEMENT']
                 fields:
                     - { type: 'group', columns: 6, icon: 'id-badge', label: 'Participation' }
-                    - { property: 'conference', type: 'App\Form\EasyAdmin\ParticipationConferencesType', type_options: { attr: { data-widget: 'select2' } } }
+                    - { property: 'conference', type: 'App\Form\EasyAdmin\FutureConferencesType', type_options: { attr: { data-widget: 'select2' } } }
                     - { property: 'participant' }
                     - { property: 'asSpeaker' }
                     - property: 'transportStatus'

diff --git a/config/packages/easy_admin/talk.yaml b/config/packages/easy_admin/talk.yaml
@@ -31,6 +31,6 @@ easy_admin:
                 fields:
                     <<: *talkFields
                     4: { type: 'group', columns: 6, icon: 'send', label: 'Publication' }
-                    5: { property: 'conferences', type: 'easyadmin_autocomplete', type_options: { mapped: false, class: App\Entity\Conference, multiple: true } }
+                    5: { property: 'conference', type: 'App\Form\EasyAdmin\FutureConferencesType', type_options: { mapped: false, class: App\Entity\Conference, multiple: true, attr: { data-widget: 'select2' } } }
                     6: { property: authors, type: App\Form\EasyAdmin\TalkUserType, type_options: { mapped: false, required: true } }
 
diff --git a/...asyAdmin/ParticipationConferencesType.php → src/Form/EasyAdmin/FutureConferencesType.php b/...asyAdmin/ParticipationConferencesType.php → src/Form/EasyAdmin/FutureConferencesType.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class ParticipationConferencesType extends AbstractType
+class FutureConferencesType extends AbstractType
 {
     public function __construct(
         private ConferenceRepository $conferenceRepository,

diff --git a/src/Form/EasyAdmin/TalkSubmitType.php b/src/Form/EasyAdmin/TalkSubmitType.php
@@ -15,6 +15,7 @@
 use App\Entity\Submit;
 use App\Entity\Talk;
 use App\Entity\User;
+use App\Repository\ConferenceRepository;
 use EasyCorp\Bundle\EasyAdminBundle\Form\Type\EasyAdminAutocompleteType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -29,6 +30,7 @@ class TalkSubmitType extends AbstractType
 {
     public function __construct(
         private RequestStack $requestStack,
+        private ConferenceRepository $conferenceRepository,
     ) {
     }
 
@@ -40,6 +42,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             ])
             ->add('conference', EasyAdminAutocompleteType::class, [
                 'class' => Conference::class,
+                'query_builder' => $this->conferenceRepository->getFutureConferencesQueryBuilder(),
             ])
             ->add('status', ChoiceType::class, [
                 'choices' => array_flip(Submit::STATUS_EMOJIS),