diff --git a/src/Bundle/ChillMainBundle/Form/Type/AddressDateType.php b/src/Bundle/ChillMainBundle/Form/Type/AddressDateType.php index 15cb2c778..299728d6e 100644 --- a/src/Bundle/ChillMainBundle/Form/Type/AddressDateType.php +++ b/src/Bundle/ChillMainBundle/Form/Type/AddressDateType.php @@ -1,5 +1,14 @@ setDefault('data_class', Address::class); } - } diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php index 8cee2982f..7b6dc201e 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php @@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Controller; use Chill\MainBundle\Entity\Address; use Chill\MainBundle\Form\Type\AddressDateType; -use Chill\MainBundle\Form\Type\AddressType; use Chill\PersonBundle\Entity\Household\Household; use Chill\PersonBundle\Form\HouseholdType; use Chill\PersonBundle\Repository\Household\PositionRepository; @@ -208,12 +207,12 @@ class HouseholdController extends AbstractController $address_id = $request->query->getInt('address_id'); - // loop over adresses of the household, to be sure that the household is associated // to the edited address $address = null; + foreach ($household->getAddresses() as $householdAddress) { - if ($address_id === $householdAddress->getId()) { + if ($householdAddress->getId() === $address_id) { $address = $householdAddress; } }