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

[-] BO : fix display bug when virtual file upload fails

Browse Source
This commit is contained in:
tDidierjean
2012-04-17 08:53:45 +00:00
parent 9c225269a4
commit 5caeffeb2e
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+12 -3
View File
@@ -47,16 +47,21 @@
var result = data.getAttribute("result"); var result = data.getAttribute("result");
var msg = data.getAttribute("msg"); var msg = data.getAttribute("msg");
var fileName = data.getAttribute("filename"); var fileName = data.getAttribute("filename");
$("#upload-confirmation").show();
if (result == "error") if (result == "error")
$("#upload-confirmation td").html('<div class="error">{l s='Error:'} ' + msg + '</div>'); {
$("#upload-confirmation").hide();
$("#upload-error td").html('<div class="error">{l s='Error:'} ' + msg + '</div>');
$("#upload-error").show();
}
else else
{ {
$('#upload_input').hide(); $('#upload-error').hide();
$('#file_missing').hide(); $('#file_missing').hide();
$('#virtual_product_name').attr('value', fileName); $('#virtual_product_name').attr('value', fileName);
$("#upload-confirmation .error").remove();
$('#upload-confirmation div').prepend('<span>{l s='The file'}&nbsp;"<a class="link" href="get-file-admin.php?file='+msg+'&filename='+fileName+'">'+fileName+'</a>"&nbsp;{l s='has successfully been uploaded'}' + $('#upload-confirmation div').prepend('<span>{l s='The file'}&nbsp;"<a class="link" href="get-file-admin.php?file='+msg+'&filename='+fileName+'">'+fileName+'</a>"&nbsp;{l s='has successfully been uploaded'}' +
'<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="' + msg + '" /></span>'); '<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="' + msg + '" /></span>');
$("#upload-confirmation").show();
} }
} }
} }
@@ -147,6 +152,9 @@
<p class="preference_description">{l s='Your server\'s maximum upload file size is'}:&nbsp;{$upload_max_filesize} {l s='MB'}</p> <p class="preference_description">{l s='Your server\'s maximum upload file size is'}:&nbsp;{$upload_max_filesize} {l s='MB'}</p>
</td> </td>
</tr> </tr>
<tr id="upload-error" style="display:none">
<td colspan=2></td>
</tr>
<tr id="upload-confirmation" style="display:none"> <tr id="upload-confirmation" style="display:none">
<td colspan=2> <td colspan=2>
{if $up_filename} {if $up_filename}
@@ -226,4 +234,5 @@
</table> </table>
</div> </div>
</div> </div>
<div style="clear:both"></div>
</div> </div>
admin-dev/uploadProductFile.php
+1 -1
View File
@@ -53,5 +53,5 @@ if (isset($_FILES['virtual_product_file']) AND is_uploaded_file($_FILES['virtual
else else
{ {
header('HTTP/1.1 500 Error'); header('HTTP/1.1 500 Error');
echo '<return result="error" msg="Unknown error" filename="'.ProductDownload::getNewFilename().'" />'; echo '<return result="error" msg="Could not upload file" filename="'.ProductDownload::getNewFilename().'" />';
} }