TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finish contentFolder removing process

Browse Source
This commit is contained in:
Manuel Raynaud
2013-10-01 10:24:09 +02:00
parent 02322f8f11
commit 34ec2364e3
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Config/Resources/routing/admin.xml
View File

@@ -395,11 +395,11 @@
<default key="_controller">Thelia\Controller\Admin\ContentController::deleteAction</default> <default key="_controller">Thelia\Controller\Admin\ContentController::deleteAction</default>
</route> </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> <default key="_controller">Thelia\Controller\Admin\ContentController::addAdditionalFolderAction</default>
</route> </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> <default key="_controller">Thelia\Controller\Admin\ContentController::removeAdditionalFolderAction</default>
</route> </route>

26
templates/admin/default/content-edit.html
View File

@@ -165,28 +165,29 @@
</div> </div>
{* Delete related content confirmation dialog *} {* Delete category confirmation dialog *}
{capture "delete_content_dialog"} {capture "delete_folder_dialog"}
<!-- <input type="hidden" name="category_id" value="{$category_id}" /> --> <input type="hidden" name="content_id" value="{$content_id}" />
<input type="hidden" name="content_id" id="content_delete_id" value="" /> <input type="hidden" name="additional_folder_id" id="additional_folder_delete_id" value="" />
<input type="hidden" name="folder_id" id="folder_delete_id" value="" />
<input type="hidden" name="current_tab" value="details" /> <input type="hidden" name="current_tab" value="association" />
{/capture} {/capture}
{include {include
file = "includes/generic-confirm-dialog.html" file = "includes/generic-confirm-dialog.html"
dialog_id = "delete_content_dialog" dialog_id = "delete_folder_dialog"
dialog_title = {intl l="Remove related content"} dialog_title = {intl l="Remove associated folder"}
dialog_message = {intl l="Do you really want to remove this related content ?"} 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_action = {url path='/admin/content/folder/delete'}
form_content = {$smarty.capture.delete_content_dialog nofilter} form_content = {$smarty.capture.delete_folder_dialog nofilter}
} }
{/block} {/block}
{block name="javascript-initialization"} {block name="javascript-initialization"}
{javascripts file='assets/js/dropzone.js'} {javascripts file='assets/js/dropzone.js'}
<script src="{$asset_url}"></script> <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') $('#tabbed-menu a[href="#{$current_tab}"]').tab('show')
{/if} {/if}
$('a.delete-folder').click(function(e) {
$('#additional_folder_delete_id').val($(this).data('id'));
});
// Set proper content ID in delete content from // Set proper content ID in delete content from
$('a.delete-content').click(function(ev) { $('a.delete-content').click(function(ev) {

2
templates/admin/default/includes/content-folder-management.html
View File

@@ -74,7 +74,7 @@
<td class="actions"> <td class="actions">
<div class="btn-group"> <div class="btn-group">
{loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.product.category.delete"} {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> <span class="glyphicon glyphicon-trash"></span>
</a> </a>
{/loop} {/loop}