Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Address: remove forceRedirect option: backUrl option not null is considerated as forceRedirect true

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-09-22 13:18:46 +02:00
parent dbb9e6a663
commit dfc6ed9bf3
10 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
View File

@ -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 {

3
src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
View File

@ -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;

3
src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
View File

@ -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
}

5
src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
View File

@ -18,7 +18,6 @@
* stickyActions bool (default: false)
* useValidFrom bool (default: false)
* useValidTo bool (default: false)
* forceRedirect bool (default: false)
* hideAddress bool (default: false)
#}
<div class="address-container"
@ -70,10 +69,6 @@
data-use-valid-to="true"
{% endif %}
{% if forceRedirect is defined and forceRedirect == 1 %}
data-force-redirect="true"
{% endif %}
{% if hideAddress is defined and hideAddress == 1 %}
data-hide-address="true"
{% endif %}

4
src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
View File

@ -29,9 +29,11 @@
{# include vue_address component #}
{% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
targetEntity: { name: 'person', id: person.id },
backUrl: path('chill_person_address_list', { 'person_id': person.id }),
openPanesInModal: false,
} %}
{#
backUrl: path('chill_person_address_list', { 'person_id': person.id }),
#}
{% endblock %}

2
src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
View File

@ -29,10 +29,10 @@
{# include vue_address component #}
{% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
targetEntity: { name: 'person', id: person.id },
backUrl: path('chill_person_address_list', { 'person_id': person.id }),
stickyActions: true,
} %}
{#
backUrl: path('chill_person_address_list', { 'person_id': person.id }),
openPanesInModal: false,
useValidFrom: true,
#}

6
src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
View File

@ -9,12 +9,10 @@
{# include vue_address component #}
{% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
targetEntity: { name: 'household', id: household.id },
stickyActions: true
} %}
{#
backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
stickyActions: true,
openPanesInModal: false,
#}
} %}
</div>
{% endblock %}

5
src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
View File

@ -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,
#}
</div>
{% endblock %}

5
src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
View File

@ -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,
#}
</li>
@ -68,8 +67,6 @@
}) }}
<ul class="record_actions">
<li>
{# include vue_address component #}
<a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}"
class="btn btn-edit"></a>

1
src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
View File

@ -32,7 +32,6 @@
{% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
targetEntity: { name: 'household', id: household.id },
backUrl: path('chill_person_household_summary', { 'household_id': household.id }),
forceRedirect: true,
hideAddress: true,
mode: 'new',
buttonSize: 'btn-sm',