Merge branch 'master' of git://github.com/Chill-project/Main

Resources/config/routing.yml

@@ -1,16 +1,16 @@
 root:
-    pattern: /
+    path: /
     defaults:
         _controller: FrameworkBundle:Redirect:urlRedirect
         path: /homepage
         permanent: true
 
 chill_main_homepage_without_locale:
-    pattern:  /homepage
+    path:  /homepage
     defaults: { _controller: ChillMainBundle:Default:indexWithoutLocale }
 
 chill_main_homepage:
-    pattern:  /{_locale}/homepage
+    path:  /{_locale}/homepage
     defaults: { _controller: ChillMainBundle:Default:index }
     options:
         menus:
@@ -20,7 +20,7 @@ chill_main_homepage:
                 icons: [home]
 
 chill_main_export_index:
-    pattern: /{_locale}/export
+    path: /{_locale}/export
     defaults: { _controller: ChillMainBundle:Export:index }
     options:
         menus:
@@ -30,7 +30,7 @@ chill_main_export_index:
                 icons: [upload]
 
 chill_main_admin_central:
-    pattern: /{_locale}/admin
+    path: /{_locale}/admin
     defaults: { _controller: ChillMainBundle:Admin:index }
     options:
         menus:
@@ -40,7 +40,7 @@ chill_main_admin_central:
                 icons: [gears]
 
 chill_main_search:
-    pattern: /{_locale}/search
+    path: /{_locale}/search
     defaults: { _controller: ChillMainBundle:Search:search }
 
 login:

Resources/config/services.yml

@@ -81,6 +81,19 @@ services:
             - "@doctrine.orm.entity_manager"
         tags:
             - { name: form.type, alias: select2_chill_language }
+            
+    chill.main.form.type.center:
+        class: Chill\MainBundle\Form\Type\CenterType
+        arguments:
+            - "@security.token_storage"
+            - "@chill.main.form.data_transformer.center_transformer"
+        tags:
+            - { name: form.type, alias: center }
+            
+    chill.main.form.data_transformer.center_transformer:
+        class: Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer
+        arguments:
+            - "@doctrine.orm.entity_manager"
 
     chill.main.search_provider:
         class: Chill\MainBundle\Search\SearchProvider
@@ -91,3 +104,8 @@ services:
             - "@doctrine.orm.entity_manager"
         calls:
             - [ setContainer, ["@service_container"]]
+            
+    chill.main.security.authorization.helper:
+        class: Chill\MainBundle\Security\Authorization\AuthorizationHelper
+        arguments:
+            - "@security.role_hierarchy"