From ff63e0a28ced71bb1923fa08f902290f2def34b1 Mon Sep 17 00:00:00 2001
From: Vincent Augagneur <vincent.augagneur@prestashop.com>
Date: Fri, 14 Jun 2013 11:17:07 +0200
Subject: [PATCH] [-] BO : fixed bug #PSCFV-9405 - Delete file of downloadable
 product when cancel

---
 .../controllers/products/virtualproduct.tpl   |  7 +++--
 js/admin-products.js                          | 30 +++++++++++--------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
index 6f46e7704..0a6c0d865 100644
--- a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+++ b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
@@ -159,7 +159,10 @@
 								<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="{$up_filename}" />
 							{/if}
 							<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'}"/>
 								</a>
 							</div>
@@ -173,7 +176,7 @@
 							</td>
 							 <td class="col-right">
 								{$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'}"/>
 								</a>
 							</td>
diff --git a/js/admin-products.js b/js/admin-products.js
index 1867893ba..0ee818a21 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -1356,23 +1356,27 @@ product_tabs['VirtualProduct'] = new function(){
 		// Bind file deletion
 		$(('#product-tab-content-VirtualProduct')).delegate('a.delete_virtual_product', 'click', function(e){
 			e.preventDefault();
-			if (!$('#virtual_product_id').val())
+			if (confirm(delete_this_file))
 			{
-				$('#upload_input').show();
-				$('#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();
+				if (!$('#virtual_product_id').val())
+				{
 					$('#upload_input').show();
 					$('#virtual_product_name').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();
+					});
+				}
+
 			}
 		});
 	}