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

[*] BO : fix update javascript because radio button shared stocks deleted, fix error in automatic replacement

Browse Source
This commit is contained in:
hAitmansour
2011-10-27 09:41:20 +00:00
parent 59b1b86e09
commit 2d3ff4abfc
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/group_shop/form.tpl
+2 -2
View File
@@ -42,9 +42,9 @@
displayFlags(languages, id_language, {$allowEmployeeFormLang}); displayFlags(languages, id_language, {$allowEmployeeFormLang});
$('input[name=share_order]').attr('disabled', true); $('input[name=share_order]').attr('disabled', true);
$('input[name=share_customer], input[name=share_stock]').click(function() $('input[name=share_customer]').click(function()
{ {
var disabled = ($('input[name=share_customer]').attr('checked') && $('input[name=share_stock]').attr('checked')) ? false : true; var disabled = ($('input[name=share_customer]').attr('checked')) ? false : true;
$('input[name=share_order]').attr('disabled', disabled); $('input[name=share_order]').attr('disabled', disabled);
if (disabled) if (disabled)
$('#share_order_off').attr('checked', true); $('#share_order_off').attr('checked', true);
controllers/admin/AdminGroupShopController.php
+1 -1
View File
@@ -150,7 +150,7 @@ class AdminGroupShopControllerCore extends AdminController
'defaultGroup' => Shop::getInstance(Configuration::get('PS_SHOP_DEFAULT'))->getGroupID() 'defaultGroup' => Shop::getInstance(Configuration::get('PS_SHOP_DEFAULT'))->getGroupID()
)); ));
return parent::initForm(); $this->content .= parent::initForm()
$import_data = array( $import_data = array(
'attribute_group' => $this->l('Attribute groups'), 'attribute_group' => $this->l('Attribute groups'),