dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : fixed bug #PSCFV-9405 - Delete file of downloadable product when cancel

Browse Source
This commit is contained in:
Vincent Augagneur
2013-06-14 11:17:07 +02:00
parent 4a1de9bf31
commit ff63e0a28c
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+5 -2
View File
@@ -159,7 +159,10 @@
<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="{$up_filename}" /> <input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="{$up_filename}" />
{/if} {/if}
<div class="conf"> <div class="conf">
<a class="delete_virtual_product" id="delete_downloadable_product" onclick="return confirm('{l s='Delete this file'}')" href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red"> <script>
delete_this_file = '{l s='Delete this file'}';
</script>
<a class="delete_virtual_product" id="delete_downloadable_product" href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red">
<img src="../img/admin/delete.gif" alt="{l s='Delete this file'}"/> <img src="../img/admin/delete.gif" alt="{l s='Delete this file'}"/>
</a> </a>
</div> </div>
@@ -173,7 +176,7 @@
</td> </td>
<td class="col-right"> <td class="col-right">
{$product->productDownload->getHtmlLink(false, true)} {$product->productDownload->getHtmlLink(false, true)}
<a onclick="return confirm('{l s='Delete this file'})')" href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red delete_virtual_product"> <a href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red delete_virtual_product">
<img src="../img/admin/delete.gif" alt="{l s='Delete this file'}"/> <img src="../img/admin/delete.gif" alt="{l s='Delete this file'}"/>
</a> </a>
</td> </td>
js/admin-products.js
+17 -13
View File
@@ -1356,23 +1356,27 @@ product_tabs['VirtualProduct'] = new function(){
// Bind file deletion // Bind file deletion
$(('#product-tab-content-VirtualProduct')).delegate('a.delete_virtual_product', 'click', function(e){ $(('#product-tab-content-VirtualProduct')).delegate('a.delete_virtual_product', 'click', function(e){
e.preventDefault(); e.preventDefault();
if (!$('#virtual_product_id').val()) if (confirm(delete_this_file))
{ {
$('#upload_input').show(); if (!$('#virtual_product_id').val())
$('#virtual_product_name').val(''); {
$('#virtual_product_file').val('');
$('#upload-confirmation').hide().find('span').remove();
}
else
{
var object = this;
ajaxAction(this.href, 'deleteVirtualProduct', function(){
$(object).closest('tr').remove();
$('#upload_input').show(); $('#upload_input').show();
$('#virtual_product_name').val(''); $('#virtual_product_name').val('');
$('#virtual_product_file').val(''); $('#virtual_product_file').val('');
$('#virtual_product_id').remove(); $('#upload-confirmation').hide().find('span').remove();
}); }
else
{
var object = this;
ajaxAction(this.href, 'deleteVirtualProduct', function(){
$(object).closest('tr').remove();
$('#upload_input').show();
$('#virtual_product_name').val('');
$('#virtual_product_file').val('');
$('#virtual_product_id').remove();
});
}
} }
}); });
} }