// Fix product attributes

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11308 b9a71923-0436-4b27-9f14-aed3839534dd

js/admin-products.js

@@ -142,7 +142,6 @@ function editProductAttribute(ids, token)
 			$('#product_att_list').html('');
 			removeButtonCombination('update');
 			$.scrollTo('#add_new_combination', 1200, { offset: -100 });
-
 			var wholesale_price = Math.abs(data[0]['wholesale_price']);
 			var price = Math.abs(data[0]['price']);
 			var weight = Math.abs(data[0]['weight']);
@@ -151,17 +150,13 @@ function editProductAttribute(ids, token)
 			var ean = data[0]['ean13'];
 			var quantity = data[0]['quantity'];
 			var image = false;
-			var old_attr = Array(data[0]['list_attributes']);
-
-			var product_att_list = '';
+			var product_att_list = new Array();
 			for(i=0;i<data.length;i++)
 			{
-				product_att_list += data[i]['group_name']+' : ';
-				product_att_list += data[i]['attribute_name']+', ';
-				product_att_list += data[i]['id_attribute']+', ';
+				product_att_list.push(data[i]['group_name']+' : '+data[i]['attribute_name']);
+				product_att_list.push(data[i]['id_attribute']);
 			}
 
-			var old_attr = Array(product_att_list.substr(0, (product_att_list.length-2)));
 			var id_product_attribute = data[0]['id_product_attribute'];
 			var default_attribute = data[0]['default_on'];
 			var eco_tax = data[0]['ecotax'];
@@ -184,7 +179,7 @@ function editProductAttribute(ids, token)
 				ean,
 				quantity,
 				image,
-				old_attr,
+				product_att_list,
 				id_product_attribute,
 				default_attribute,
 				eco_tax,

js/attributesBack.js

@@ -144,7 +144,6 @@ virtual_product_nb_days, is_shareable)
 		var opt = document.createElement('option');
 		opt.text = old_attr[i++];
 		opt.value = old_attr[i];
-
 		try {
 			elem.add(opt, null);
 		}