Rename SessionEditType in SessionType

[airbundle] / Controller / ApplicationController.php

diff --git a/Controller/ApplicationController.php b/Controller/ApplicationController.php
index 3690b9485f365870f88534cb8e6cbc16706adaeb..45538ffe6f7b0e489827ffabdd24e8dca7cb606c 100644 (file)
--- a/Controller/ApplicationController.php
+++ b/Controller/ApplicationController.php
@@ -5,6 +5,8 @@ namespace Rapsys\AirBundle\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Form\FormError;
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Rapsys\AirBundle\Entity\Slot;
 use Rapsys\AirBundle\Entity\User;
 use Rapsys\AirBundle\Entity\Session;
@@ -41,24 +43,19 @@ class ApplicationController extends DefaultController {
                        'slot' => $this->getDoctrine()->getRepository(Slot::class)->findOneById(3)
                ]);
 
-               //Reject non post requests
-               if (!$request->isMethod('POST')) {
-                       throw new \RuntimeException('Request method MUST be POST');
-               }
-
                //Refill the fields in case of invalid form
                $form->handleRequest($request);
 
                //Handle invalid form
-               if (!$form->isValid()) {
+               if (!$form->isSubmitted() || !$form->isValid()) {
                        //Set section
-                       $section = $this->translator->trans('Application Add');
+                       $section = $this->translator->trans('Application add');
 
                        //Set title
-                       $title = $section.' - '.$this->translator->trans($this->config['site']['title']);
+                       $title = $this->translator->trans($this->config['site']['title']).' - '.$section;
 
                        //Render the view
-                       return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'section' => $section, 'form' => $form]+$this->context);
+                       return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'section' => $section, 'form' => $form->createView()]+$this->context);
                }
 
                //Get doctrine
@@ -283,6 +280,30 @@ class ApplicationController extends DefaultController {
                        } else {
                                //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($data['slot'])), '%date%' => $data['date']->format('Y-m-d')]));
+
+                               //Set section
+                               $section = $this->translator->trans('Application add');
+
+                               //Set title
+                               $title = $this->translator->trans($this->config['site']['title']).' - '.$section;
+
+                               //Render the view
+                               return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'section' => $section, 'form' => $form->createView()]+$this->context);
+                       }
+
+                       //Check if admin
+                       if (!$this->isGranted('ROLE_ADMIN') && $session->getStart() < new \DateTime('00:00:00')) {
+                               //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($data['slot'])), '%date%' => $data['date']->format('Y-m-d')]));
+
+                               //Set section
+                               $section = $this->translator->trans('Application add');
+
+                               //Set title
+                               $title = $this->translator->trans($this->config['site']['title']).' - '.$section;
+
+                               //Render the view
+                               return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'section' => $section, 'form' => $form->createView()]+$this->context);
                        }
 
                        //Queue session save
@@ -372,10 +393,20 @@ class ApplicationController extends DefaultController {
                                //Remove route and controller from route defaults
                                unset($route['_route'], $route['_controller']);
 
+                               //Check if session view route
+                               if ($name == 'rapsys_air_session_view' && !empty($route['id'])) {
+                                       //Replace id
+                                       $route['id'] = $session->getId();
+                               //Other routes
+                               } else {
+                                       //Set session
+                                       $route['session'] = $session->getId();
+                               }
+
                                //Generate url
-                               return $this->redirectToRoute($name, ['session' => $session->getId()]+$route);
+                               return $this->redirectToRoute($name, $route);
                        //No route matched
-                       } catch(ResourceNotFoundException $e) {
+                       } catch(MethodNotAllowedException|ResourceNotFoundException $e) {
                                //Unset referer to fallback to default route
                                unset($referer);
                        }