From dfc6ed9bf3870b6e0c66fbd81efb2a520b662e02 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 22 Sep 2021 13:18:46 +0200 Subject: [PATCH] Address: remove forceRedirect option: backUrl option not null is considerated as forceRedirect true --- .../public/vuejs/Address/components/AddAddress.vue | 8 +++++--- .../public/vuejs/Address/components/ShowPane.vue | 3 +-- .../Resources/public/vuejs/Address/index.js | 3 --- .../Resources/views/Address/_insert_vue_address.html.twig | 5 ----- .../Resources/views/Address/edit.html.twig | 4 +++- .../Resources/views/Address/new.html.twig | 2 +- .../Resources/views/Household/address_edit.html.twig | 6 ++---- .../Resources/views/Household/address_move.html.twig | 5 +---- .../Resources/views/Household/addresses.html.twig | 5 +---- .../Resources/views/Household/summary.html.twig | 1 - 10 files changed, 14 insertions(+), 28 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 ae3a0324f..ad11fc02f 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue @@ -252,7 +252,6 @@ export default { validFrom: false, validTo: false }, - forceRedirect: false, hideAddress: false }, entity: { @@ -324,6 +323,9 @@ export default { bypassFirstStep() { // exception: passing step0 if new address and pane are not in modal return !this.context.edit && !this.inModal; + }, + forceRedirect() { + return this.context.backUrl !== null; } }, mounted() { @@ -396,7 +398,7 @@ export default { this.openDatePane(); } else { this.applyChanges(); - if (!this.options.forceRedirect) { + if (!this.forceRedirect) { this.openShowPane(); } } @@ -425,7 +427,7 @@ export default { */ afterLastPaneAction(params) { this.initForm(); - if (this.options.forceRedirect === true) { + if (this.forceRedirect) { console.log("redirect to backUrl"); window.location.assign(this.context.backUrl); } else { 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 25f8c95ec..96628766c 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue @@ -86,8 +86,7 @@ export default { this.options.hideAddress : this.defaultz.hideAddress; }, forceRedirect() { - return (typeof this.options.forceRedirect !== 'undefined') ? - this.options.forceRedirect : this.defaultz.forceRedirect; + return this.context.backUrl !== null; }, noAddressWithStickyActions() { return !this.context.edit && !this.address.id && this.options.stickyActions; diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js index 04cbbd0d3..f0a308b7b 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js @@ -52,9 +52,6 @@ containers.forEach((container) => { validTo: container.dataset.useValidTo === 'true' //boolean, default: false }, - /// Force redirection after last step (cfr. backUrl) - forceRedirect: container.dataset.forceRedirect === 'true', //boolean, default: false - /// Don't display show renderbox Address: showPane display only a button hideAddress: container.dataset.hideAddress === 'true' //boolean, default: false } diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig index 68531dea1..f4f63c4eb 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig @@ -18,7 +18,6 @@ * stickyActions bool (default: false) * useValidFrom bool (default: false) * useValidTo bool (default: false) - * forceRedirect bool (default: false) * hideAddress bool (default: false) #}
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig index 50346672b..2015a8599 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig @@ -10,12 +10,9 @@ {% include '@ChillMain/Address/_insert_vue_address.html.twig' with { targetEntity: { name: 'household', id: household.id }, backUrl: path('chill_person_household_addresses', { 'household_id': household.id }), - forceRedirect: true, + openPanesInModal: false, stickyActions: true, } %} - {# - openPanesInModal: false, - #}
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig index 717f31e77..94a79db2a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig @@ -18,14 +18,13 @@ {% include '@ChillMain/Address/_insert_vue_address.html.twig' with { targetEntity: { name: 'household', id: household.id }, backUrl: path('chill_person_household_addresses', { 'household_id': household.id }), - forceRedirect: true, mode: 'new', - useValidFrom: true, buttonSize: 'btn-lg', buttonText: 'Move household', modalTitle: 'Move household', } %} {# + useValidFrom: true, #} @@ -68,8 +67,6 @@ }) }}