From: Raphaƫl Gertz Date: Mon, 28 Dec 2020 07:16:09 +0000 (+0100) Subject: Add not found exception on location not found X-Git-Tag: 0.1.7~37 X-Git-Url: https://git.rapsys.eu/airbundle/commitdiff_plain/2c346012be21b3cea9b998f9c48be619cafe97ab Add not found exception on location not found Change title scheme format Change section name Cleanup --- diff --git a/Controller/LocationController.php b/Controller/LocationController.php index 7f1a96b..aa21c34 100644 --- a/Controller/LocationController.php +++ b/Controller/LocationController.php @@ -23,13 +23,15 @@ class LocationController extends DefaultController { $doctrine = $this->getDoctrine(); //Fetch location - $location = $doctrine->getRepository(Location::class)->findOneById($id); + if (empty($location = $doctrine->getRepository(Location::class)->findOneById($id))) { + throw $this->createNotFoundException($this->translator->trans('Unable to find location: %id%', ['%id%' => $id])); + } //Set section - $section = $this->translator->trans($location); + $section = $this->translator->trans('Argentine Tango at '.$location); //Set title - $title = $section.' - '.$this->translator->trans($this->config['site']['title']); + $title = $this->translator->trans($this->config['site']['title']).' - '.$section; //Init context $context = []; @@ -84,7 +86,7 @@ class LocationController extends DefaultController { //Fetch locations //XXX: we want to display all active locations anyway - $locations = $doctrine->getRepository(Location::class)->fetchTranslatedLocationByDatePeriod($this->translator, $period/*, !$this->isGranted('IS_AUTHENTICATED_REMEMBERED')*/); + $locations = $doctrine->getRepository(Location::class)->findTranslatedSortedByPeriod($this->translator, $period); //Render the view return $this->render('@RapsysAir/location/view.html.twig', ['id' => $id, 'title' => $title, 'section' => $section, 'calendar' => $calendar, 'locations' => $locations]+$context+$this->context);