Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-21 15:13:50 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'improve_address' into person_renderbox_thirdparty_onthefly

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-09-16 19:58:03 +02:00
parent 310e9f5a82 aae2ee32f6
commit 0bb0b24c21
14 changed files with 183 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,8 +30,8 @@
{% 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 }),
binModalStep1: false,
binModalStep2: false,
bindModalStep1: false,
bindModalStep2: false,
} %}
{% endblock %}

8
src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
View File

@@ -74,8 +74,8 @@
backUrl: path('chill_person_address_list', { 'person_id': person.id }),
mode: 'edit',
addressId: address.id,
binModalStep1: false,
binModalStep2: false,
bindModalStep1: false,
bindModalStep2: false,
} %}
#}
@@ -90,8 +90,8 @@
backUrl: path('chill_person_address_list', { 'person_id': person.id }),
mode: 'edit',
addressId: address.id,
binModalStep1: false,
binModalStep2: false,
bindModalStep1: false,
bindModalStep2: false,
} %}
#}

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

@@ -30,8 +30,8 @@
{% 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 }),
binModalStep1: false,
binModalStep2: false,
bindModalStep1: false,
bindModalStep2: false,
} %}
{% endblock %}

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

@@ -10,8 +10,8 @@
{% 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 })
binModalStep1: false,
binModalStep2: false,
bindModalStep1: false,
bindModalStep2: false,
} %}
</div>

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

@@ -10,8 +10,8 @@
{% 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 })
binModalStep1: false,
binModalStep2: false,
bindModalStep1: false,
bindModalStep2: false,
} %}
</div>

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

@@ -37,8 +37,12 @@
buttonSize: 'btn-sm',
buttonText: 'Move household',
modalTitle: 'Move household',
buttonDisplayText: false
buttonDisplayText: false,
} %}
{#
bindModalStep1: false,
bindModalStep2: true,
#}
</li>
<li class="list-inline-item">
<a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"