From 5784a4cd46da5ca84cbe9d58a91538b8309f17c7 Mon Sep 17 00:00:00 2001
From: lBrieu <laurent.brieu@prestashop.com>
Date: Thu, 17 Nov 2011 09:54:13 +0000
Subject: [PATCH] // bug fix when trying to add files to combinations

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10200 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/products/combinations.tpl | 5 ++---
 admin-dev/themes/template/products/form.tpl         | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/admin-dev/themes/template/products/combinations.tpl b/admin-dev/themes/template/products/combinations.tpl
index 1211813e2..cfcc60675 100644
--- a/admin-dev/themes/template/products/combinations.tpl
+++ b/admin-dev/themes/template/products/combinations.tpl
@@ -121,9 +121,8 @@
 		<div id="upload-confirmation2">
 
 <p id="gethtmlink" style="display: none;">{l s='This is the link'} :&nbsp;{$product->productDownload->getHtmlLink(false, true)}
-		<a id="make_downloadable_product_attribute" onclick="return confirm('.addslashes("{l s='Delete this file' slashes=1}")).')" href="index.php?tab=AdminProducts&id_product={$product->productDownload->id_product}&id_category={$id_category}&token={$token}&deleteVirtualProductAttribute=true" class="red">{l s='Delete this file'}</a></p>
-			
-<a 
+		<a id="make_downloadable_product_attribute" onclick="return confirm('.addslashes("{l s='Delete this file' slashes=1}")).')" href="index.php?tab=AdminProducts&id_product={$product->productDownload->id_product}&id_category={$id_category}&token={$token}&deleteVirtualProductAttribute=true" class="red">{l s='Delete this file'}</a>
+</p> 
 
 </div>
 		<a id="delete_downloadable_product_attribute" style="display:none;" onclick="return confirm('{l s='Delete this file' slashes=1}')" href="index.php?tab=AdminProducts&id_product={$product->id}&id_category={$id_category}&token={$token}&deleteVirtualProductAttribute=true" class="red">{l s='Delete this file'}</a>
diff --git a/admin-dev/themes/template/products/form.tpl b/admin-dev/themes/template/products/form.tpl
index c1358b96f..591a77279 100644
--- a/admin-dev/themes/template/products/form.tpl
+++ b/admin-dev/themes/template/products/form.tpl
@@ -212,10 +212,10 @@ $(document).ready(function(){
 						$('#virtual_product_file_label').hide();
 						$('#file_missing').hide();
 						$('#delete_downloadable_product_attribute').show();
-						$('#virtual_product_name_attribute').attr('value', fileName);
 						$('#upload-confirmation2').html(
 							'<a class="link" href="get-file-admin.php?file='+msg+'&filename='+fileName+'">{l s='The file'}&nbsp;"' + fileName + '"&nbsp;{l s='has successfully been uploaded'}</a>' +
 							'<input type="hidden" id="virtual_product_filename_attribute" name="virtual_product_filename_attribute" value="' + msg + '" />');
+						$('#virtual_product_name_attribute').attr('value', fileName);		
 						
 						link = $("#delete_downloadable_product_attribute").attr('href');		
 						$("#delete_downloadable_product_attribute").attr('href', link+"&file="+msg);