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

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

Browse Source 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
This commit is contained in:
Kevin Granger
2013-07-24 17:01:23 +02:00
parent f7d1743c8a 6ac3f1133a
commit 77f80b1774
603 changed files with 14577 additions and 11364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/admin-products.js
+12 -12
View File
@@ -1238,7 +1238,7 @@ product_tabs['Suppliers'] = new function(){
var self = this;
this.manageDefaultSupplier = function() {
var default_is_ok = false;
var default_is_set = false;
var availables_radio_buttons = [];
var radio_buttons = $('input[name="default_supplier"]');
@@ -1251,27 +1251,25 @@ product_tabs['Suppliers'] = new function(){
if (item.is(':checked'))
{
item.removeAttr("checked");
default_is_ok = false;
}
}
else
if (item.is(':checked'))
{
availables_radio_buttons.push(item);
default_is_set = true;
}
}
if (default_is_ok == false)
if (!default_is_set)
{
for (i=0; i<availables_radio_buttons.length; i++)
for (i=0; i<radio_buttons.length; i++)
{
var item = $(availables_radio_buttons[i]);
var item = $(radio_buttons[i]);
if (item.is(':disabled') == false)
{
item.attr("checked", true);
default_is_ok = true;
}
break;
}
}
};
@@ -1280,6 +1278,7 @@ product_tabs['Suppliers'] = new function(){
$('.supplierCheckBox').live('click', function() {
var check = $(this);
var checkbox = $('#default_supplier_'+check.val());
if (this.checked)
{
// enable default radio button associated
@@ -1290,6 +1289,7 @@ product_tabs['Suppliers'] = new function(){
// disable default radio button associated
checkbox.attr('disabled', true);
}
//manage default supplier check
self.manageDefaultSupplier();
});
@@ -1299,14 +1299,14 @@ product_tabs['Suppliers'] = new function(){
$('#suppliers_accordion').accordion();
// If one second was not enough to display page, another resize is needed
setTimeout(function() {
$('#suppliers_accordion').accordion('resize');
$('#suppliers_accordion').accordion({ heightStyle: "fill" });
}, 3000);
}, 1000);
// Resize the accordion once the page is visible because of the bug with accordions initialized
// inside a display:none block not having the correct size.
$('#suppliers_accordion').parents('.product-tab-content').bind('displayed', function(){
$('#suppliers_accordion').accordion("resize");
$('#suppliers_accordion').accordion({ heightStyle: "fill" });
});
};
}
@@ -1414,7 +1414,7 @@ product_tabs['Warehouses'] = new function(){
// Resize the accordion once the page is visible because of the bug with accordions initialized
// inside a display:none block not having the correct size.
$('#warehouse_accordion').parents('.product-tab-content').bind('displayed', function(){
$('#warehouse_accordion').accordion("resize");
$('#warehouse_accordion').accordion("refresh");
});
};
}