Add rapsyspack.file_util helper

[treebundle] / config / routes / rapsystree.yaml

diff --git a/config/routes/rapsystree.yaml b/config/routes/rapsystree.yaml
index 03d85ead5eb67f690db7062e9ab6c3fe65720b95..ab0db7f226dd8ee63f637f3ffab7c8da393db268 100644 (file)
--- a/config/routes/rapsystree.yaml
+++ b/config/routes/rapsystree.yaml
@@ -15,32 +15,19 @@ rapsystree_about:
 
 rapsystree_album:
     path:
 
 rapsystree_album:
     path:

-        en_gb: '/en/album/{id}/{slug}{path}'
-        fr_fr: '/album/{id}/{slug}{path}'
+        en_gb: '/en/album/{id}/{slug}/{path}'
+        fr_fr: '/album/{id}/{slug}/{path}'

     controller: Rapsys\TreeBundle\Controller\TreeController::album
     defaults:
         id: ~
     controller: Rapsys\TreeBundle\Controller\TreeController::album
     defaults:
         id: ~

-        path: ~
+        path: ''

         slug: ~
     requirements:
         id: '\d+'
         slug: ~
     requirements:
         id: '\d+'

-        path: '/.*'
+        path: '.*?'

         slug: '[\w-]+'
     methods: GET|POST
 
         slug: '[\w-]+'
     methods: GET|POST
 

-rapsystree_asset:
-    path:
-        en_gb: '/en/asset/{id}{path}'
-        fr_fr: '/actif/{id}{path}'
-    controller: Rapsys\TreeBundle\Controller\TreeController::asset
-    defaults:
-        id: ~
-        path: ~
-    requirements:
-        id: '\d+'
-        path: '/.*'
-    methods: GET|POST
-

 rapsystree_contact:
     path:
         en_gb: '/en/contact'
 rapsystree_contact:
     path:
         en_gb: '/en/contact'


@@ -75,6 +62,19 @@ rapsysuser_edit:
         hash: '[a-zA-Z0-9=_-]+'
     methods: GET|POST
 
         hash: '[a-zA-Z0-9=_-]+'
     methods: GET|POST
 

+rapsystree_element:
+    path:
+        en_gb: '/en/element/{id}/{path}'
+        fr_fr: '/element/{id}/{path}'
+    controller: Rapsys\TreeBundle\Controller\TreeController::element
+    defaults:
+        id: ~
+        path: ''
+    requirements:
+        id: '\d+'
+        path: '.*?'
+    methods: GET
+

 rapsysuser_index:
     path:
         en_gb: '/en/user'
 rapsysuser_index:
     path:
         en_gb: '/en/user'