From 5ea12a581b636e43149d972b4eb7edb753d876f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 24 May 2022 22:56:08 +0200 Subject: [PATCH] calendar app: fix concerned groups --- src/Bundle/ChillCalendarBundle/Form/CalendarType.php | 9 ++++----- .../Resources/public/vuejs/Calendar/store/getters.js | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php index 987862195..a94b463d3 100644 --- a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php +++ b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php @@ -129,11 +129,10 @@ class CalendarType extends AbstractType $builder->add('persons', HiddenType::class); $builder->get('persons') ->addModelTransformer($this->personsToIdDataTransformer); - /* - $builder->add('professionals', HiddenType::class); - $builder->get('professionals') - ->addModelTransformer($this->partiesToIdDataTransformer); - */ + + $builder->add('professionals', HiddenType::class); + $builder->get('professionals') + ->addModelTransformer($this->partiesToIdDataTransformer); $builder->add('users', HiddenType::class); $builder->get('users') diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/getters.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/getters.js index 90fcef224..3f87ca203 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/getters.js +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/getters.js @@ -194,10 +194,10 @@ export default { return []; } const allEntities = [ - getters.suggestedPersons, - getters.suggestedRequestor, - getters.suggestedUser, - getters.suggestedResources + ...getters.suggestedPersons, + ...getters.suggestedRequestor, + ...getters.suggestedUser, + ...getters.suggestedResources ]; const uniqueIds = [...new Set(allEntities.map(i => `${i.type}-${i.id}`))]; return Array.from(uniqueIds, id => allEntities.filter(r => `${r.type}-${r.id}` === id)[0]);