Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-21 07:03:49 +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-17 13:26:28 +02:00
parent 3c5f0ce15e 3f3b7af42b
commit 8204107ceb
18 changed files with 447 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -32,7 +32,7 @@
{% 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 }),
mode: 'create',
mode: 'new',
buttonSize: 'btn-lg',
buttonText: 'Add an address',
modalTitle: 'Add an address',
@@ -74,8 +74,7 @@
backUrl: path('chill_person_address_list', { 'person_id': person.id }),
mode: 'edit',
addressId: address.id,
bindModalStep1: false,
bindModalStep2: false,
openPanesInModal: false,
} %}
#}
@@ -90,8 +89,7 @@
backUrl: path('chill_person_address_list', { 'person_id': person.id }),
mode: 'edit',
addressId: address.id,
bindModalStep1: false,
bindModalStep2: false,
openPanesInModal: false,
} %}
#}

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

@@ -30,11 +30,12 @@
{% 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 }),
bindModalStep1: false,
bindModalStep2: false,
useValidFrom: true,
useValidTo: false
openPanesInModal: false,
stickyActions: true,
} %}
{#
#}
{% 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 }),
bindModalStep1: false,
bindModalStep2: false,
openPanesInModal: false,
stickyActions: true
} %}
</div>

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

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

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

@@ -18,7 +18,7 @@
{% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
targetEntity: { name: 'household', id: household.id },
backUrl: path('chill_person_household_address_move', { 'household_id': household.id }),
mode: 'create',
mode: 'new',
buttonSize: 'btn-lg',
buttonText: 'Move household',
modalTitle: 'Move household',

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

@@ -33,15 +33,14 @@
{% 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 }),
mode: 'create',
mode: 'new',
buttonSize: 'btn-sm',
buttonText: 'Move household',
modalTitle: 'Move household',
buttonDisplayText: false,
} %}
{#
bindModalStep1: false,
bindModalStep2: true,
openPanesInModal: false
#}
</li>
<li class="list-inline-item">