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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Kevin Granger
2013-11-26 19:03:27 +01:00
parent 32af46e42c 13b5762367
commit 37d4d4bd5f
532 changed files with 26512 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/helpers/uploader/ajax.tpl
+23 -15
View File
@@ -88,26 +88,34 @@
if (data.result) {
if (typeof data.result.{$name} !== 'undefined') {
for (var i=0; i<data.result.{$name}.length; i++) {
if (data.result.{$name}[i] !== null && data.result.{$name}[i].status == 'ok') {
var response = data.result.{$name}[i];
var cover = "icon-check-empty";
if (response.cover == "1")
cover = "icon-check-sign";
imageLine(response.id, response.path, response.position, cover, response.shops,
response.legend[{$default_language|intval}])
$("#countImage").html(parseInt($("#countImage").html()) + 1);
$("#img" + id).remove();
$("#imageTable").tableDnDUpdate();
if (typeof data.result.{$name}[i].error !== 'undefined' && data.result.{$name}[i].error != '') {
$('#{$id}-errors').html('<strong>'+data.result.{$name}[i].name+'</strong> : '+data.result.{$name}[i].error).parent().show();
}
else
{
$(data.context).appendTo($('#{$id}-success'));
$('#{$id}-success').parent().show();
if (data.result.{$name}[i] !== null && data.result.{$name}[i].status == 'ok')
{
var response = data.result.{$name}[i];
var cover = "icon-check-empty";
if (response.cover == "1")
cover = "icon-check-sign";
imageLine(response.id, response.path, response.position, cover, response.shops,
response.legend[{$default_language|intval}])
$("#countImage").html(parseInt($("#countImage").html()) + 1);
$("#img" + id).remove();
$("#imageTable").tableDnDUpdate();
}
}
}
}
$(data.context).find('button').remove();
$(data.context).appendTo($('#{$id}-success'));
$('#{$id}-success').parent().show();
}
},
}).on('fileuploadalways', function (e, data) {