Append dances and subscriptions to findAllIndexed results

[airbundle] / Controller / DefaultController.php

diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index 4c81688402c077df10d56d1b63c0d927aecbecaf..14590963806e098561cc9da8ab44c9f23fb37847 100644 (file)
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -36,7 +36,7 @@ class DefaultController extends AbstractController {
        /**
         * The about page
         *
-        * @desc Display the about informations
+        * Display the about informations
         *
         * @param Request $request The request instance
         * @return Response The rendered view
@@ -67,7 +67,7 @@ class DefaultController extends AbstractController {
        /**
         * The contact page
         *
-        * @desc Send a contact mail to configured contact
+        * Send a contact mail to configured contact
         *
         * @param Request $request The request instance
         *
@@ -104,7 +104,8 @@ 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'),
+                       'captcha' => true,
                        'method' => 'POST'
                ]);
 
@@ -282,7 +283,7 @@ class DefaultController extends AbstractController {
        /**
         * The organizer regulation page
         *
-        * @desc Display the organizer regulation policy
+        * Display the organizer regulation policy
         *
         * @param Request $request The request instance
         * @return Response The rendered view
@@ -315,7 +316,7 @@ class DefaultController extends AbstractController {
        /**
         * The terms of service page
         *
-        * @desc Display the terms of service policy
+        * Display the terms of service policy
         *
         * @param Request $request The request instance
         * @return Response The rendered view
@@ -348,7 +349,7 @@ class DefaultController extends AbstractController {
        /**
         * The frequently asked questions page
         *
-        * @desc Display the frequently asked questions
+        * Display the frequently asked questions
         *
         * @param Request $request The request instance
         * @return Response The rendered view
@@ -382,7 +383,7 @@ class DefaultController extends AbstractController {
        /**
         * List all users
         *
-        * @desc Display all user with a group listed as users
+        * Display all user with a group listed as users
         *
         * @param Request $request The request instance
         *
@@ -395,7 +396,7 @@ class DefaultController extends AbstractController {
                        $this->context['title']['page'] = $this->translator->trans('Libre Air user list');
 
                        //Set section
-                       $this->context['title']['section'] = $this->translator->trans('Users');
+                       $this->context['title']['section'] = $this->translator->trans('User');
 
                        //Set description
                        $this->context['description'] = $this->translator->trans('Lists Libre air users');
@@ -405,7 +406,7 @@ class DefaultController extends AbstractController {
                        $this->context['title']['page'] = $this->translator->trans('Libre Air organizer list');
 
                        //Set section
-                       $this->context['title']['section'] = $this->translator->trans('Organizers');
+                       $this->context['title']['section'] = $this->translator->trans('Organizer');
 
                        //Set description
                        $this->context['description'] = $this->translator->trans('Lists Libre air organizers');
@@ -439,7 +440,7 @@ class DefaultController extends AbstractController {
        /**
         * List all sessions for the user
         *
-        * @desc Display all sessions for the user with an application or login form
+        * Display all sessions for the user with an application or login form
         *
         * @param Request $request The request instance
         * @param int $id The user id
@@ -465,7 +466,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
@@ -599,7 +600,7 @@ class DefaultController extends AbstractController {
                $this->context['title']['page'] = $this->translator->trans('%pseudonym% organizer', ['%pseudonym%' => $this->context['user']['pseudonym']]);
 
                //Set section
-               $this->context['title']['section'] = $this->translator->trans('Users');
+               $this->context['title']['section'] = $this->translator->trans('User');
 
                //With locations
                if (!empty($locations)) {
@@ -635,16 +636,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 +668,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 +719,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 +759,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']]);
                                        }
                                }