master merged into branch

This commit is contained in:
Julie Lenaerts 2022-07-18 15:05:34 +02:00
commit 2911cb5063
2 changed files with 7 additions and 0 deletions

View File

@ -17,6 +17,7 @@ and this project adheres to
* [search]: Order of birthdate fields changed in advanced search to avoid confusion. * [search]: Order of birthdate fields changed in advanced search to avoid confusion.
* [workflow]: Constraint added to workflow (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/675) * [workflow]: Constraint added to workflow (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/675)
* [social_action]: only show active objectives (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/625) * [social_action]: only show active objectives (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/625)
* [household]: Reposition and cut button for enfant hors menage have been deleted (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/620)
## Test releases ## Test releases

View File

@ -180,10 +180,16 @@
{% if members|length > 0 %} {% if members|length > 0 %}
<div class="flex-table list-household-members"> <div class="flex-table list-household-members">
{% for m in members %} {% for m in members %}
{% if m.position.shareHousehold %}
{% include '@ChillPerson/Household/_render_member.html.twig' with { {% include '@ChillPerson/Household/_render_member.html.twig' with {
'member': m, 'member': m,
'customButtons': { 'before': _self.customButtons(m, household) } 'customButtons': { 'before': _self.customButtons(m, household) }
} %} } %}
{% else %}
{% include '@ChillPerson/Household/_render_member.html.twig' with {
'member': m,
} %}
{% endif %}
{% endfor %} {% endfor %}
</div> </div>
{% else %} {% else %}