Allow get and post on add application route

Move user listing in default controller
Move user view in default controller
Add new rapsys_air_session_view2 developpement route
Override default user controller edit action

diff --git a/Resources/config/routes/rapsys_air.yaml b/Resources/config/routes/rapsys_air.yaml
index e148bfbaac14bc772aeb78caec23cca2983d9faf..3fd3afe88b1aacc3db081bcc9b8cf5bbb6edcfc3 100644 (file)
--- a/Resources/config/routes/rapsys_air.yaml
+++ b/Resources/config/routes/rapsys_air.yaml
@@ -94,7 +94,7 @@ rapsys_air_application_add:
         en_gb: '/en/application'
         fr_fr: '/reservation'
     controller: Rapsys\AirBundle\Controller\ApplicationController::add
         en_gb: '/en/application'
         fr_fr: '/reservation'
     controller: Rapsys\AirBundle\Controller\ApplicationController::add

-    methods: POST
+    methods: GET|POST

 
 rapsys_air_session:
     path:
 
 rapsys_air_session:
     path:


@@ -125,6 +125,13 @@ rapsys_air_session_view:
     controller: Rapsys\AirBundle\Controller\SessionController::view
     methods: GET
 
     controller: Rapsys\AirBundle\Controller\SessionController::view
     methods: GET
 

+rapsys_air_session_view2:
+    path:
+        en_gb: '/en/session2/{id<\d+>}'
+        fr_fr: '/seance2/{id<\d+>}'
+    controller: Rapsys\AirBundle\Controller\SessionController::view2
+    methods: GET
+

 rapsys_air_snippet_add:
     path:
         en_gb: '/en/snippet'
 rapsys_air_snippet_add:
     path:
         en_gb: '/en/snippet'


@@ -143,14 +150,14 @@ rapsys_air_user:
     path:
         en_gb: '/en/user'
         fr_fr: '/utilisateur'
     path:
         en_gb: '/en/user'
         fr_fr: '/utilisateur'

-    controller: Rapsys\AirBundle\Controller\UserController::index
+    controller: Rapsys\AirBundle\Controller\DefaultController::userIndex

     methods: GET
 
 rapsys_air_user_view:
     path:
         en_gb: '/en/user/{id<\d+>}'
         fr_fr: '/utilisateur/{id<\d+>}'
     methods: GET
 
 rapsys_air_user_view:
     path:
         en_gb: '/en/user/{id<\d+>}'
         fr_fr: '/utilisateur/{id<\d+>}'

-    controller: Rapsys\AirBundle\Controller\UserController::view
+    controller: Rapsys\AirBundle\Controller\DefaultController::userView

     methods: GET|POST
 
 rapsys_user_confirm:
     methods: GET|POST
 
 rapsys_user_confirm:


@@ -167,7 +174,7 @@ rapsys_user_edit:
     path:
         en_gb: '/en/user/{hash}/{mail}'
         fr_fr: '/utilisateur/{hash}/{mail}'
     path:
         en_gb: '/en/user/{hash}/{mail}'
         fr_fr: '/utilisateur/{hash}/{mail}'

-    controller: Rapsys\UserBundle\Controller\DefaultController::edit
+    controller: Rapsys\AirBundle\Controller\UserController::edit

     requirements:
         mail: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'
     requirements:
         mail: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'