Merge branch 'master' into features/sql-vue-from-household-address-to-person

src/Bundle/ChillPersonBundle/Controller/HouseholdController.php

@@ -8,6 +8,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\Position;
 
 /**
  * @Route("/{_locale}/person/household")
@@ -25,9 +26,20 @@ class HouseholdController extends AbstractController
     public function summary(Request $request, Household $household)
     {
         // TODO ACL
+
+        $positions = $this->getDoctrine()->getManager()
+            ->getRepository(Position::class)
+            ->findAll()
+            ;
+
+        // little performance improvement: 
+        // initialize members collection, which will avoid
+        // some queries
+        $household->getMembers()->initialize();
         return $this->render('@ChillPerson/Household/summary.html.twig',
             [
-                'household' => $household
+                'household' => $household,
+                'positions' => $positions
             ]
         );
     }
@@ -43,9 +55,20 @@ class HouseholdController extends AbstractController
     public function members(Request $request, Household $household)
     {
         // TODO ACL
+        $positions = $this->getDoctrine()->getManager()
+            ->getRepository(Position::class)
+            ->findAll()
+            ;
+
+        // little performance improvement: 
+        // initialize members collection, which will avoid
+        // some queries
+        $household->getMembers()->initialize();
+
         return $this->render('@ChillPerson/Household/members.html.twig',
             [
-                'household' => $household
+                'household' => $household,
+                'positions' => $positions
             ]
         );
     }