Match upstream prototype

[airbundle] / Controller / ApplicationController.php

diff --git a/Controller/ApplicationController.php b/Controller/ApplicationController.php
index 9ee5a8989308bbc4a73e9521af4b802726d9551c..8aa7baae88d1473f0fc30d759faf8170deee4af4 100644 (file)
--- a/Controller/ApplicationController.php
+++ b/Controller/ApplicationController.php
@@ -57,7 +57,6 @@ class ApplicationController extends AbstractController {
                //Set dance default
                $danceDefault = !empty($danceFavorites)?current($danceFavorites):null;
 
-
                //Get favorites locations
                $locationFavorites = $this->doctrine->getRepository(Location::class)->findByUserId($this->security->getUser()->getId());
 
@@ -115,16 +114,22 @@ class ApplicationController extends AbstractController {
                        'slot_default' => $this->doctrine->getRepository(Slot::class)->findOneByTitle('Evening')
                ]);
 
+               //Set title
+               $this->context['title']['page'] = $this->translator->trans('Application add');
+
+               //Set section
+               $this->context['title']['section'] = $this->translator->trans('Application');
+
+               //Set description
+               $this->context['description'] = $this->translator->trans('Add an application and session');
+
                //Refill the fields in case of invalid form
                $form->handleRequest($request);
 
                //Handle invalid form
                if (!$form->isSubmitted() || !$form->isValid()) {
-                       //Set title
-                       $title = $this->translator->trans('Application add');
-
                        //Render the view
-                       return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'form' => $form->createView()]+$this->context);
+                       return $this->render('@RapsysAir/application/add.html.twig', ['form' => $form->createView()]+$this->context);
                }
 
                //Get data
@@ -335,11 +340,8 @@ class ApplicationController extends AbstractController {
                                //Add error in flash message
                                $this->addFlash('error', $this->translator->trans('Session on %date% %location% %slot% not yet supported', ['%location%' => $this->translator->trans('at '.$data['location']), '%slot%' => $this->translator->trans('the '.strtolower(strval($data['slot']))), '%date%' => $data['date']->format('Y-m-d')]));
 
-                               //Set title
-                               $title = $this->translator->trans('Application add');
-
                                //Render the view
-                               return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'form' => $form->createView()]+$this->context);
+                               return $this->render('@RapsysAir/application/add.html.twig', ['form' => $form->createView()]+$this->context);
                        }
 
                        //Check if admin
@@ -347,11 +349,8 @@ class ApplicationController extends AbstractController {
                                //Add error in flash message
                                $this->addFlash('error', $this->translator->trans('Session in the past on %date% %location% %slot% not yet supported', ['%location%' => $this->translator->trans('at '.$data['location']), '%slot%' => $this->translator->trans('the '.strtolower(strval($data['slot']))), '%date%' => $data['date']->format('Y-m-d')]));
 
-                               //Set title
-                               $title = $this->translator->trans('Application add');
-
                                //Render the view
-                               return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'form' => $form->createView()]+$this->context);
+                               return $this->render('@RapsysAir/application/add.html.twig', ['form' => $form->createView()]+$this->context);
                        }
 
                        //Queue session save