Closes smartstore#1673 Product attributes: multiple attributes of type 'file upload' not working simultaneously

Michael-Herzog · Michael-Herzog · commit 8e18064c8a8f · 2019-08-08T14:40:00.000+02:00
diff --git a/src/Presentation/SmartStore.Web/Views/Shared/ChoiceTemplates/Choice.FileUpload.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/ChoiceTemplates/Choice.FileUpload.cshtml
@@ -35,7 +35,7 @@
 		var result = data.result;
 
 		if (result.downloadGuid) {
-			setUploadedFile(result.downloadGuid, data.files[0].name);
+			setUploadedFile(result.downloadGuid, data.files[0].name, "@(containerId)");
 		}
 
 		if (result.message) {
@@ -48,14 +48,14 @@
 		$('#@containerId .uploaded-file').empty().hide();
     }
 
-    function setUploadedFile(downloadGuid, fileName) {
+    function setUploadedFile(downloadGuid, fileName, containerId) {
         if (!_.isEmpty(downloadGuid) && downloadGuid !== '0') {
-        	$('#@containerId .hidden').val(downloadGuid);
+            $('#' + containerId + ' .hidden').val(downloadGuid);
 
         	var downloadLink = "@storeUrl" + "download/getfileupload/?downloadId=" + downloadGuid;
         	var fileLink = '<a href="' + downloadLink + '" class="fileuploadattribute" rel="nofollow">' + fileName + '</a>';
 
-			$('#@containerId .uploaded-file').html(fileLink).show();
+            $('#' + containerId + ' .uploaded-file').html(fileLink).show();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`var result = data.result;`
`36`	`36`
`37`	`37`	`if (result.downloadGuid) {`
`38`		`- setUploadedFile(result.downloadGuid, data.files[0].name);`
	`38`	`+ setUploadedFile(result.downloadGuid, data.files[0].name, "@(containerId)");`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`if (result.message) {`
`@@ -48,14 +48,14 @@`
`48`	`48`	`$('#@containerId .uploaded-file').empty().hide();`
`49`	`49`	`}`
`50`	`50`
`51`		`- function setUploadedFile(downloadGuid, fileName) {`
	`51`	`+ function setUploadedFile(downloadGuid, fileName, containerId) {`
`52`	`52`	`if (!_.isEmpty(downloadGuid) && downloadGuid !== '0') {`
`53`		`- $('#@containerId .hidden').val(downloadGuid);`
	`53`	`+ $('#' + containerId + ' .hidden').val(downloadGuid);`
`54`	`54`
`55`	`55`	`var downloadLink = "@storeUrl" + "download/getfileupload/?downloadId=" + downloadGuid;`
`56`	`56`	`var fileLink = '<a href="' + downloadLink + '" class="fileuploadattribute" rel="nofollow">' + fileName + '</a>';`
`57`	`57`
`58`		`- $('#@containerId .uploaded-file').html(fileLink).show();`
	`58`	`+ $('#' + containerId + ' .uploaded-file').html(fileLink).show();`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`