From: Raphaƫl Gertz Date: Fri, 8 Mar 2024 00:32:51 +0000 (+0100) Subject: Shorten air bundle route alias X-Git-Tag: 0.4.0~19 X-Git-Url: https://git.rapsys.eu/airbundle/commitdiff_plain/ca4cd083c302be4c5a1b50de9d3dcd70cf20b1d8 Shorten air bundle route alias Add default values to class member variables --- diff --git a/Controller/ApplicationController.php b/Controller/ApplicationController.php index 8aa7baa..914afa7 100644 --- a/Controller/ApplicationController.php +++ b/Controller/ApplicationController.php @@ -88,7 +88,7 @@ class ApplicationController extends AbstractController { //Create ApplicationType form $form = $this->factory->create('Rapsys\AirBundle\Form\ApplicationType', null, [ //Set the action - 'action' => $this->generateUrl('rapsys_air_application_add'), + 'action' => $this->generateUrl('rapsysair_application_add'), //Set the form attribute #'attr' => [ 'class' => 'col' ], //Set dance choices @@ -142,10 +142,7 @@ class ApplicationController extends AbstractController { //Catch no session case } catch (NoResultException $e) { //Create the session - $session = new Session(); - $session->setLocation($data['location']); - $session->setDate($data['date']); - $session->setSlot($data['slot']); + $session = new Session($data['date'], $data['location'], $data['slot']); //Get location $location = $data['location']->getTitle(); @@ -440,7 +437,7 @@ class ApplicationController extends AbstractController { unset($route['_route'], $route['_controller']); //Check if session view route - if ($name == 'rapsys_air_session_view' && !empty($route['id'])) { + if ($name == 'rapsysair_session_view' && !empty($route['id'])) { //Replace id $route['id'] = $session->getId(); //Other routes @@ -459,6 +456,6 @@ class ApplicationController extends AbstractController { } //Redirect to cleanup the form - return $this->redirectToRoute('rapsys_air', ['session' => $session->getId()]); + return $this->redirectToRoute('rapsysair', ['session' => $session->getId()]); } } diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php index 9554557..54250c9 100644 --- a/Controller/DefaultController.php +++ b/Controller/DefaultController.php @@ -104,7 +104,7 @@ class DefaultController extends AbstractController { //Create the form according to the FormType created previously. //And give the proper parameters $form = $this->factory->create('Rapsys\AirBundle\Form\ContactType', $data, [ - 'action' => $this->generateUrl('rapsys_air_contact'), + 'action' => $this->generateUrl('rapsysair_contact'), 'method' => 'POST' ]); @@ -465,7 +465,7 @@ class DefaultController extends AbstractController { //With invalid user slug if ($this->context['user']['slug'] !== $user) { //Redirect to cleaned url - return $this->redirectToRoute('rapsys_air_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]); + return $this->redirectToRoute('rapsysair_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]); } //Fetch calendar @@ -635,16 +635,7 @@ class DefaultController extends AbstractController { //Without existing snippet } else { //Init snippet - $current = new Snippet(); - - //Set default locale - $current->setLocale($this->locale); - - //Set default user - $current->setUser($user); - - //Set default location - $current->setLocation($this->doctrine->getRepository(Location::class)->findOneById($location['id'])); + $current = new Snippet($this->locale, $this->doctrine->getRepository(Location::class)->findOneById($location['id']), $user); } //Create SnippetType form @@ -676,7 +667,7 @@ class DefaultController extends AbstractController { $this->addFlash('notice', $this->translator->trans('Snippet for %user% %location% updated', ['%location%' => $location['at'], '%user%' => $this->context['user']['pseudonym']])); //Redirect to cleaned url - return $this->redirectToRoute('rapsys_air_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]); + return $this->redirectToRoute('rapsysair_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]); } //Add form to context @@ -727,7 +718,7 @@ class DefaultController extends AbstractController { $this->addFlash('notice', $this->translator->trans('Image for %user% %location% deleted', ['%location%' => $location['at'], '%user%' => $this->context['user']['pseudonym']])); //Redirect to cleaned url - return $this->redirectToRoute('rapsys_air_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]); + return $this->redirectToRoute('rapsysair_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]); } } @@ -767,7 +758,7 @@ class DefaultController extends AbstractController { $this->addFlash('notice', $this->translator->trans('Image for %user% %location% updated', ['%location%' => $location['at'], '%user%' => $this->context['user']['pseudonym']])); //Redirect to cleaned url - return $this->redirectToRoute('rapsys_air_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]); + return $this->redirectToRoute('rapsysair_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]); } }