From 98f1f19e9accdc7d8adc8a58cee9ee46e3f7b2ef Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 22 Sep 2021 20:23:55 +0200 Subject: [PATCH] courseLocation: commit context addressId change when remove PersonLocation (fix bad address in editPane) --- .../public/vuejs/Address/components/AddAddress.vue | 2 +- .../AccompanyingCourse/components/CourseLocation.vue | 2 +- .../public/vuejs/AccompanyingCourse/store/index.js | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue index 4f8e53b7f..a37cd4ee3 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue @@ -339,7 +339,7 @@ export default { console.log('Mounted now !'); if (this.context.edit) { - console.log('getInitialAddress'); // !!! + console.log('getInitialAddress', this.context.addressId); this.getInitialAddress(this.context.addressId); } this.openShowPane(); diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue index ccb02346d..cf1218eae 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue @@ -133,12 +133,12 @@ export default { this.$store.commit('setAddressContext', context); }, removeAddress() { - //console.log('remove address'); let payload = { target: this.context.target.name, targetId: this.context.target.id, locationStatusTo: 'none' }; + //console.log('remove address'); this.$store.dispatch('updateLocation', payload); }, displayErrors() { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js index c884dd810..6f4d5334b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -129,9 +129,13 @@ let initPromise = getAccompanyingCourse(id) state.addressContext = context; }, updateLocation(state, r) { - //console.log('### mutation: set location attributes', r); - state.accompanyingCourse.location = r.location; + //console.log('### mutation: set location attributes', r); state.accompanyingCourse.locationStatus = r.locationStatus; + if (r.locationStatus !== 'person') { + state.addressContext.addressId = r.location.address_id; + //console.log('mutation: update context addressId', state.addressContext.addressId); + } + state.accompanyingCourse.location = r.location; state.accompanyingCourse.personLocation = r.personLocation; }, setEditContextTrue(state, payload) {