// Fix some bug on multishop + improve display of shop pages

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10518 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-11-23 13:09:23 +00:00
parent 7c7eda3167
commit 0f87f86203
8 changed files with 104 additions and 40 deletions
+20 -4
View File
@@ -42,9 +42,25 @@ class AdminGroupShopControllerCore extends AdminController
$this->deleted = false;
$this->fieldsDisplay = array(
'id_group_shop' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'name' => array('title' => $this->l('County'), 'width' => 130, 'filter_key' => 'b!name'),
'active' => array('title' => $this->l('Enabled'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false, 'filter_key' => 'active'),
'id_group_shop' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25,
),
'name' => array(
'title' => $this->l('Group shop'),
'width' => 'auto',
'filter_key' => 'b!name',
),
'active' => array(
'title' => $this->l('Enabled'),
'align' => 'center',
'active' => 'status',
'type' => 'bool',
'orderby' => false,
'filter_key' => 'active',
'width' => 50,
),
);
parent::__construct();
@@ -155,7 +171,7 @@ class AdminGroupShopControllerCore extends AdminController
'tax_rules_group' => $this->l('Tax rules groups'),
'zone' => $this->l('Zones'),
);
if (!$this->object->id)
$this->fields_import_form = array(
'legend' => array(