Merge remote-tracking branch 'origin/master' into calendar/synchro-msgraph

src/Bundle/ChillMainBundle/config/routes.yaml

@@ -62,13 +62,6 @@ chill_main_homepage:
 #                 order: 0
 #                 label: Main admin menu
 #
-chill_main_admin_permissions:
-    path: /{_locale}/admin/permissions
-    controller: Chill\MainBundle\Controller\AdminController::indexPermissionsAction
-
-chill_main_admin_locations:
-    path: /{_locale}/admin/locations
-    controller: Chill\MainBundle\Controller\AdminController::indexLocationsAction
 
 chill_main_search:
     path: /{_locale}/search.{_format}

src/Bundle/ChillMainBundle/config/routes/center.yaml

@@ -2,10 +2,6 @@ admin_center:
     path:     /
     controller: Chill\MainBundle\Controller\CenterController::indexAction
 
-admin_center_show:
-    path:     /{id}/show
-    controller: Chill\MainBundle\Controller\CenterController::showAction
-
 admin_center_new:
     path:     /new
     controller: Chill\MainBundle\Controller\CenterController::newAction

src/Bundle/ChillMainBundle/config/routes/scope.yaml

@@ -2,10 +2,6 @@ admin_scope:
     path:     /
     controller: Chill\MainBundle\Controller\ScopeController::indexAction
 
-admin_scope_show:
-    path:     /{id}/show
-    controller: Chill\MainBundle\Controller\ScopeController::showAction
-
 admin_scope_new:
     path:     /new
     controller: Chill\MainBundle\Controller\ScopeController::newAction

src/Bundle/ChillMainBundle/config/services/form.yaml

@@ -144,6 +144,10 @@ services:
 
     Chill\MainBundle\Form\WorkflowStepType: ~
 
+    Chill\MainBundle\Form\DataMapper\PrivateCommentDataMapper:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Form\DataTransformer\IdToLocationDataTransformer: ~
     Chill\MainBundle\Form\DataTransformer\IdToUserDataTransformer: ~
     Chill\MainBundle\Form\DataTransformer\IdToUsersDataTransformer: ~

src/Bundle/ChillMainBundle/config/services/menu.yaml

@@ -17,9 +17,3 @@ services:
         autoconfigure: true
         tags:
             - { name: 'chill.menu_builder' }
-
-    Chill\MainBundle\Routing\MenuBuilder\AdminSectionMenuBuilder:
-        arguments:
-            $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-        tags:
-            - { name: 'chill.menu_builder' }

src/Bundle/ChillMainBundle/config/services/serializer.yaml

@@ -10,4 +10,9 @@ services:
     Chill\MainBundle\Serializer\Normalizer\DoctrineExistingEntityNormalizer:
         tags:
             - { name: 'serializer.normalizer', priority: 8 }
+    Chill\MainBundle\Serializer\Normalizer\PrivateCommentEmbeddableNormalizer:
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: 'serializer.normalizer', priority: 64 }