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

// BO - Fix bug where the current product tab is loaded twice

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11947 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean committed 2011-12-30 15:28:57 +00:00
1 parent d322d6cbf5
commit 3d54800f89
2 files changed
+9 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/products/form.tpl
+1 -2
View File
@@ -178,8 +178,7 @@
} }
$("#product-tab-content-wait").show(); $("#product-tab-content-wait").show();
if ($("#product-tab-content-"+id).hasClass('not-loaded') && !$("#product-tab-content-"+id).hasClass('loading'))
if ($("#product-tab-content-"+id).hasClass('not-loaded'))
displayTabProductById(this, id, true); displayTabProductById(this, id, true);
else else
{ {
js/admin-products.js
+8 -2
View File
@@ -218,10 +218,12 @@ function editProductAttribute(ids, token)
function displayTabProductById(el, id, selected) function displayTabProductById(el, id, selected)
{ {
myurl = $(el).attr("href")+"&ajax=1"; myurl = $(el).attr("href")+"&ajax=1";
// Used to check if the tab is already in the process of being loaded
$("#product-tab-content-"+id).addClass('loading');
$.ajax({ $.ajax({
url : myurl, url : myurl,
async : true, async : true,
success :function(data) success : function(data)
{ {
$("#product-tab-content-"+id).html(data); $("#product-tab-content-"+id).html(data);
$("#product-tab-content-"+id).removeClass('not-loaded'); $("#product-tab-content-"+id).removeClass('not-loaded');
@@ -231,6 +233,10 @@ function displayTabProductById(el, id, selected)
$("#link-"+id).addClass('selected'); $("#link-"+id).addClass('selected');
$("#product-tab-content-"+id).show(); $("#product-tab-content-"+id).show();
} }
},
complete : function(data)
{
$("#product-tab-content-"+id).removeClass('loading');
} }
}); });
} }
@@ -256,7 +262,7 @@ function getManufacturers()
if (j) if (j)
for (var i = 0; i < j.length; i++) for (var i = 0; i < j.length; i++)
options += '<option value="' + j[i].optionValue + '">' + j[i].optionDisplay + '</option>'; options += '<option value="' + j[i].optionValue + '">' + j[i].optionDisplay + '</option>';
$("select#id_manufacturer").replaceWith("<select id=\"id_manufacturer\">"+options+"</select>"); $("select#id_manufacturer").html(options);
}, },
error: function(XMLHttpRequest, textStatus, errorThrown) error: function(XMLHttpRequest, textStatus, errorThrown)
{ {