From 962081c17d8e0f6fd7a21f5b810768445f6046ec Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Sat, 21 Sep 2013 13:42:00 +0200
Subject: [PATCH] use placeholder in folder update route

---
 core/lib/Thelia/Config/Resources/routing/admin.xml    | 3 ++-
 core/lib/Thelia/Controller/Admin/FolderController.php | 2 +-
 templates/admin/default/folder-edit.html              | 6 +++---
 templates/admin/default/folders.html                  | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 0b129fd0b..ead09c166 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -200,8 +200,9 @@
         <default key="_controller">Thelia\Controller\Admin\FolderController::createAction</default>
     </route>
 
-    <route id="admin.folders.update" path="/admin/folders/update" methods="get">
+    <route id="admin.folders.update" path="/admin/folders/update/{folder_id}">
         <default key="_controller">Thelia\Controller\Admin\FolderController::updateAction</default>
+        <requirement key="folder_id">\d+</requirement>
     </route>
 
     <route id="admin.folders.toggle-online" path="/admin/folders/toggle-online">
diff --git a/core/lib/Thelia/Controller/Admin/FolderController.php b/core/lib/Thelia/Controller/Admin/FolderController.php
index db8a83e48..92fe49389 100644
--- a/core/lib/Thelia/Controller/Admin/FolderController.php
+++ b/core/lib/Thelia/Controller/Admin/FolderController.php
@@ -312,7 +312,7 @@ class FolderController extends AbstractCrudController
      */
     protected function redirectToEditionTemplate()
     {
-        $this->redirectToRoute("admin.folders.update", $this->getEditionArguments());
+        $this->redirect($this->getRoute('admin.folders.update', $this->getEditionArguments()));
     }
 
     /**
diff --git a/templates/admin/default/folder-edit.html b/templates/admin/default/folder-edit.html
index 26795b7aa..1821f3bcc 100644
--- a/templates/admin/default/folder-edit.html
+++ b/templates/admin/default/folder-edit.html
@@ -21,7 +21,7 @@
 	                <div class="col-md-5 actions">
 
 	                    {if $HAS_PREVIOUS != 0}
-			                <a href="{url path='/admin/folders/update' folder_id=$PREVIOUS}" class="btn btn-default" title="{intl l='Edit previous folder'}"><span class="glyphicon glyphicon-arrow-left"></span></a>
+			                <a href="{url path="/admin/folders/update/$PREVIOUS"}" class="btn btn-default" title="{intl l='Edit previous folder'}"><span class="glyphicon glyphicon-arrow-left"></span></a>
                         {else}
                             <a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-left"></span></a>
 		                {/if}
@@ -29,7 +29,7 @@
 		                <a  href="{$URL}" target="_blank" class="btn btn-default" title="{intl l='Preview folder page'}"><span class="glyphicon glyphicon-eye-open"></span></a>
 
                         {if $HAS_NEXT != 0}
-                            <a href="{url path='/admin/folders/update' folder_id=$NEXT}" class="btn btn-default" title="{intl l='Edit next folder'}"><span class="glyphicon glyphicon-arrow-right"></span></a>
+                            <a href="{url path="/admin/folders/update/$NEXT"}" class="btn btn-default" title="{intl l='Edit next folder'}"><span class="glyphicon glyphicon-arrow-right"></span></a>
                         {else}
                             <a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-right"></span></a>
                          {/if}
@@ -67,7 +67,7 @@
 			                            {form_hidden_fields form=$form}
 
 			                            {form_field form=$form field='success_url'}
-			                                <input type="hidden" name="{$name}" value="{url path='/admin/folders/update' folder_id={$folder_id}}" />
+			                                <input type="hidden" name="{$name}" value="{url path="/admin/folders/update{$ID}"}" />
 			                            {/form_field}
 
 			                            {form_field form=$form field='locale'}
diff --git a/templates/admin/default/folders.html b/templates/admin/default/folders.html
index 4cb4eca12..ae24568c8 100644
--- a/templates/admin/default/folders.html
+++ b/templates/admin/default/folders.html
@@ -146,7 +146,7 @@
                                          <a class="btn btn-default btn-xs" title="{intl l='Browse this folder'}" href="{url path='admin/folders' folder_id=$ID}"><i class="glyphicon glyphicon-folder-open"></i></a>
 
                                          {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.folders.edit"}
-                                            <a class="btn btn-default btn-xs" title="{intl l='Edit this folder'}" href="{url path='/admin/folders/update' folder_id=$ID}"><i class="glyphicon glyphicon-edit"></i></a>
+                                            <a class="btn btn-default btn-xs" title="{intl l='Edit this folder'}" href="{url path="/admin/folders/update/{$ID}"}"><i class="glyphicon glyphicon-edit"></i></a>
                                          {/loop}
 
                                          {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.folders.delete"}
@@ -344,7 +344,7 @@
 
         {form_field form=$form field='success_url'}
            {* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller  *}
-           <input type="hidden" name="{$name}" value="{url path='/admin/folders/update' folder_id='_ID_'}" />
+           <input type="hidden" name="{$name}" value="{url path='/admin/folders/update/_ID_'}" />
         {/form_field}
 
         {form_field form=$form field='parent'}