From 4768785bb540acd75446928264619969f05b0828 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 22 Sep 2021 18:40:40 +0200 Subject: [PATCH] Address: improve forceRedirect condition, if backUrl is null or undefined --- .../Resources/public/vuejs/Address/components/AddAddress.vue | 2 +- .../Resources/public/vuejs/Address/components/ShowPane.vue | 2 +- 2 files changed, 2 insertions(+), 2 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 3d7fd20e5..c0cfa603a 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue @@ -325,7 +325,7 @@ export default { return !this.context.edit && !this.inModal; }, forceRedirect() { - return this.context.backUrl !== null; + return (!(this.context.backUrl === null || typeof this.context.backUrl === 'undefined')); } }, mounted() { diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue index 96628766c..1329b9cb7 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue @@ -86,7 +86,7 @@ export default { this.options.hideAddress : this.defaultz.hideAddress; }, forceRedirect() { - return this.context.backUrl !== null; + return (!(this.context.backUrl === null || typeof this.context.backUrl === 'undefined')); }, noAddressWithStickyActions() { return !this.context.edit && !this.address.id && this.options.stickyActions;