remove members page, move to summary

This commit is contained in:
2021-06-18 11:27:25 +02:00
parent f1120af59e
commit 0add757230
6 changed files with 214 additions and 93 deletions

View File

@@ -13,6 +13,7 @@ use Symfony\Component\Translation\TranslatorInterface;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Chill\PersonBundle\Entity\Household\Household;
use Chill\PersonBundle\Entity\Household\Position;
use Chill\PersonBundle\Repository\Household\PositionRepository;
/**
* @Route("/{_locale}/person/household")
@@ -21,12 +22,13 @@ class HouseholdController extends AbstractController
{
private TranslatorInterface $translator;
/**
* @param TranslatorInterface $translator
*/
public function __construct(TranslatorInterface $translator)
private PositionRepository $positionRepository;
public function __construct(TranslatorInterface $translator, PositionRepository $positionRepository)
{
$this->translator = $translator;
$this->positionRepository = $positionRepository;
}
/**
@@ -41,9 +43,8 @@ class HouseholdController extends AbstractController
{
// TODO ACL
$positions = $this->getDoctrine()->getManager()
->getRepository(Position::class)
->findAll()
$positions = $this->positionRepository
->findByActiveOrdered()
;
// little performance improvement:
@@ -58,42 +59,6 @@ class HouseholdController extends AbstractController
);
}
/**
* @Route(
* "/{household_id}/members",
* name="chill_person_household_members",
* methods={"GET", "HEAD"}
* )
* @ParamConverter("household", options={"id" = "household_id"})
*/
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();
if ($request->query->has('edit')) {
$form = $this->createMetadataForm($household);
} else {
$form = null;
}
return $this->render('@ChillPerson/Household/members.html.twig',
[
'household' => $household,
'positions' => $positions,
'form' => NULL !== $form ? $form->createView(): $form
]
);
}
/**
* @Route(
* "/{household_id}/addresses",