From cf78c59e768edc635b2649b300fcf081c6c464d0 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Mon, 6 Sep 2021 16:37:30 +0200 Subject: [PATCH] vue personRenderBox when no returnPath --- .../Resources/public/vuejs/AccompanyingCourse/js/i18n.js | 2 +- .../public/vuejs/_components/Entity/PersonRenderBox.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index 66c45dc13..cf685cac3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -44,7 +44,7 @@ const appMessages = { date_start_to_end: "Participation du {start} au {end}", leave_course: "L'usager quitte le parcours", sure: "Êtes-vous sûr ?", - sure_description: "Une fois confirmé, il ne sera pas possible de faire marche arrière ! La sortie restera cependant consignée dans l'historique du parcours.", + sure_description: "Une fois confirmé, il ne sera pas possible de faire marche arrière ! La sortie reste cependant consignée dans l'historique du parcours.", ok: "Oui, l'usager quitte le parcours", show_household_number: "Voir le ménage (n° {id})", show_household: "Voir le ménage" diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue index adac402d9..b8a638593 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue @@ -167,7 +167,8 @@ export default { return `/fr/person/${this.person.id}/general`; }, getCurrentHouseholdUrl() { - return `/fr/person/household/${this.person.current_household_id}/summary?returnPath=${this.returnPath}` + let returnPath = this.returnPath ? `?returnPath=${this.returnPath}` : ``; + return `/fr/person/household/${this.person.current_household_id}/summary${returnPath}` } } }