From 3c70cec396a3a5383a10b3301232a654bababba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 29 Nov 2021 14:33:29 +0100 Subject: [PATCH] merge origin/master --- .../vuejs/AccompanyingCourse/components/PersonsAssociated.vue | 2 +- .../public/vuejs/AccompanyingCourse/components/Requestor.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue index 2b317c1ec..26e74e944 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue @@ -106,7 +106,7 @@ export default { .filter((e) => e !== null) .filter((e) => e.type === 'person') .filter( - (p) => return !state.accompanyingCourse.participations.filter(pa => pa.endDate === null).map((pa) => pa.person.id).includes(p.id) + (p) => !state.accompanyingCourse.participations.filter(pa => pa.endDate === null).map((pa) => pa.person.id).includes(p.id) ) // filter persons appearing twice in requestor and resources .filter( diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue index 5d99ba184..8b72a9aa2 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue @@ -210,7 +210,6 @@ export default { }, isAnonymous: { set(value) { - //console.log('requestorIsAnonymous value',value); this.$store.dispatch('requestorIsAnonymous', value); }, get() {