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

Merge remote-tracking branch 'origin/master' into issue388_order_social_issues

Browse Source
This commit is contained in:
Julien Fastré 2022-02-28 09:51:40 +01:00
commit 3a602385cc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ and this project adheres to
<!-- write down unreleased development here --> <!-- write down unreleased development here -->
* [person] Order social issues by the field "ordering" (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/388) * [person] Order social issues by the field "ordering" (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/388)
* [Person/Household list] when listing other simultaneous members of an household, exclude the members on person, not on members (avoid to show two membersship with the same person)
## Test releases ## Test releases

2
src/Bundle/ChillPersonBundle/Entity/Household/Household.php
View File

@ -358,7 +358,7 @@ class Household
$membership->getEndDate() $membership->getEndDate()
)->filter( )->filter(
static function (HouseholdMember $m) use ($membership) { static function (HouseholdMember $m) use ($membership) {
return $m !== $membership; return $m->getPerson() !== $membership->getPerson();
} }
); );
} }