From 34ec2364e317b1627df69de822ce6f012d6893f8 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 1 Oct 2013 10:24:09 +0200
Subject: [PATCH] finish contentFolder removing process

---
 .../Thelia/Config/Resources/routing/admin.xml |  4 +--
 templates/admin/default/content-edit.html     | 26 +++++++++++--------
 .../includes/content-folder-management.html   |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 2c595b877..a3ccc577d 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -395,11 +395,11 @@
         <default key="_controller">Thelia\Controller\Admin\ContentController::deleteAction</default>
     </route>
 
-    <route id="admin.content.additional-folder.add" path="/admin/products/category/add">
+    <route id="admin.content.additional-folder.add" path="/admin/content/folder/add">
         <default key="_controller">Thelia\Controller\Admin\ContentController::addAdditionalFolderAction</default>
     </route>
 
-    <route id="admin.content.additional-folder.delete" path="/admin/products/category/delete">
+    <route id="admin.content.additional-folder.delete" path="/admin/content/folder/delete">
         <default key="_controller">Thelia\Controller\Admin\ContentController::removeAdditionalFolderAction</default>
     </route>
 
diff --git a/templates/admin/default/content-edit.html b/templates/admin/default/content-edit.html
index 0a0353e0b..a4a80acf8 100644
--- a/templates/admin/default/content-edit.html
+++ b/templates/admin/default/content-edit.html
@@ -165,28 +165,29 @@
     </div>
 
 
-{* Delete related content confirmation dialog *}
+{* Delete category confirmation dialog *}
 
-    {capture "delete_content_dialog"}
-        <!-- <input type="hidden" name="category_id" value="{$category_id}" /> -->
-        <input type="hidden" name="content_id" id="content_delete_id" value="" />
-        <input type="hidden" name="folder_id" id="folder_delete_id" value="" />
+    {capture "delete_folder_dialog"}
+        <input type="hidden" name="content_id" value="{$content_id}" />
+        <input type="hidden" name="additional_folder_id" id="additional_folder_delete_id" value="" />
 
-        <input type="hidden" name="current_tab" value="details" />
+        <input type="hidden" name="current_tab" value="association" />
     {/capture}
 
     {include
     file = "includes/generic-confirm-dialog.html"
 
-    dialog_id       = "delete_content_dialog"
-    dialog_title    = {intl l="Remove related content"}
-    dialog_message  = {intl l="Do you really want to remove this related content ?"}
+    dialog_id       = "delete_folder_dialog"
+    dialog_title    = {intl l="Remove associated folder"}
+    dialog_message  = {intl l="Do you really want to remove the content from this folder ?"}
 
-form_action     = {url path='/admin/folders/related-content/delete'}
-form_content    = {$smarty.capture.delete_content_dialog nofilter}
+form_action     = {url path='/admin/content/folder/delete'}
+form_content    = {$smarty.capture.delete_folder_dialog nofilter}
 }
 {/block}
 
+
+
 {block name="javascript-initialization"}
     {javascripts file='assets/js/dropzone.js'}
         <script src="{$asset_url}"></script>
@@ -214,6 +215,9 @@ form_content    = {$smarty.capture.delete_content_dialog nofilter}
             $('#tabbed-menu a[href="#{$current_tab}"]').tab('show')
             {/if}
 
+            $('a.delete-folder').click(function(e) {
+                $('#additional_folder_delete_id').val($(this).data('id'));
+            });
 
             // Set proper content ID in delete content from
             $('a.delete-content').click(function(ev) {
diff --git a/templates/admin/default/includes/content-folder-management.html b/templates/admin/default/includes/content-folder-management.html
index 5200ebb3e..f5bda8e4a 100644
--- a/templates/admin/default/includes/content-folder-management.html
+++ b/templates/admin/default/includes/content-folder-management.html
@@ -74,7 +74,7 @@
                                 <td class="actions">
                                     <div class="btn-group">
                                         {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.product.category.delete"}
-                                            <a class="btn btn-default btn-xs delete-category" title="{intl l='Remove the product from this category'}" href="#delete_category_dialog" data-id="{$ID}" data-toggle="modal">
+                                            <a class="btn btn-default btn-xs delete-folder" title="{intl l='Remove the product from this category'}" href="#delete_folder_dialog" data-id="{$ID}" data-toggle="modal">
                                                 <span class="glyphicon glyphicon-trash"></span>
                                             </a>
                                         {/loop}