// Fix subtabs showing in menu when there is not view access

This commit is contained in:
tDidierjean
2012-01-11 16:49:42 +00:00
parent f5ad342f5c
commit 1c2c9449c0
+2 -4
View File
@@ -960,8 +960,6 @@ class AdminControllerCore extends Controller
} }
else else
$this->errors[] = Tools::displayError('You do not have permission to edit here.'); $this->errors[] = Tools::displayError('You do not have permission to edit here.');
// todo : return value ?
} }
@@ -1270,7 +1268,7 @@ class AdminControllerCore extends Controller
foreach ($sub_tabs as $index2 => $sub_tab) foreach ($sub_tabs as $index2 => $sub_tab)
{ {
// class_name is the name of the class controller // class_name is the name of the class controller
if (Tab::checkTabRights($sub_tab) === true AND (bool)$sub_tab['active']) if (Tab::checkTabRights($sub_tab['id_tab']) === true AND (bool)$sub_tab['active'])
$sub_tabs[$index2]['href'] = $this->context->link->getAdminLink($sub_tab['class_name']); $sub_tabs[$index2]['href'] = $this->context->link->getAdminLink($sub_tab['class_name']);
else else
unset($sub_tabs[$index2]); unset($sub_tabs[$index2]);
@@ -2039,7 +2037,7 @@ class AdminControllerCore extends Controller
$this->_listTotal = Db::getInstance()->getValue('SELECT FOUND_ROWS() AS `'._DB_PREFIX_.$this->table.'`'); $this->_listTotal = Db::getInstance()->getValue('SELECT FOUND_ROWS() AS `'._DB_PREFIX_.$this->table.'`');
} }
public function getlanguages() public function getLanguages()
{ {
$cookie = $this->context->cookie; $cookie = $this->context->cookie;
$this->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0; $this->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;