Twig: test address_id in url and substring 'edit' in route

This commit is contained in:
Mathieu Jaumotte 2021-08-07 19:50:55 +02:00
parent c075ff199d
commit 62dc94bb14
7 changed files with 5 additions and 13 deletions

View File

@ -259,7 +259,7 @@ export default {
},
closeEditPane() {
console.log('close the Edit Panel (with validation)');
console.log('close the Edit Panel');
this.applyChanges();
this.flag.showPane = true;
this.flag.editPane = false;

View File

@ -68,9 +68,7 @@
aria-describedby="validFrom"
/>
</div>
<div v-if="flag.loading">
{{ $t('loading') }}
</div>
<!--div v-if="flag.loading">{{ $t('loading') }}</div-->
<div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
{{ errors }}
</div>

View File

@ -25,10 +25,10 @@
window.entityId = {{ household.id|e('js') }};
{% endif %}
{% if mode == 'edit' %}
window.addressId = {{ address_id|e('js') }};
{% if 'edit' in app.request.get('_route') %}
window.addressId = {{ app.request.get('address_id')|e('js') }};
window.mode = 'edit';
{% endif %}
window.mode = '{{ mode|e('js') }}';
{% if backUrl is not defined %}
{% if person is defined %}

View File

@ -28,8 +28,6 @@
{# include vue_address component #}
{% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
mode: 'edit',
address_id: person.lastAddress.id,
binModalStep1: false,
binModalStep2: false,
} %}

View File

@ -28,7 +28,6 @@
{# include vue_address component #}
{% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
mode: 'new',
binModalStep1: false,
binModalStep2: false,
} %}

View File

@ -8,8 +8,6 @@
<div>
{# include vue_address component #}
{% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
mode: 'edit',
address_id: household.lastAddress.id,
binModalStep1: false,
binModalStep2: false,
} %}

View File

@ -8,7 +8,6 @@
<div>
{# include vue_address component #}
{% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
mode: 'new',
binModalStep1: false,
binModalStep2: false,
} %}