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

// Code cleaning

Browse Source
This commit is contained in:
Damien Metzger
2013-10-21 18:18:48 +02:00
parent 3ae1f68b3b
commit 58aa64fab7
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tab.php
+3 -2
View File
@@ -339,12 +339,13 @@ class TabCore extends ObjectModel
* Get Instance from tab class name * Get Instance from tab class name
* *
* @param $class_name string Name of tab class * @param $class_name string Name of tab class
* @param $id_lang integer id_lang
* @return Tab Tab object (empty if bad id or class name) * @return Tab Tab object (empty if bad id or class name)
*/ */
public static function getInstanceFromClassName($class_name) public static function getInstanceFromClassName($class_name, $id_lang = null)
{ {
$id_tab = (int)Tab::getIdFromClassName($class_name); $id_tab = (int)Tab::getIdFromClassName($class_name);
return new Tab($id_tab); return new Tab($id_tab, $id_lang);
} }
public static function getNbTabs($id_parent = null) public static function getNbTabs($id_parent = null)
controllers/admin/AdminEmployeesController.php
+7 -3
View File
@@ -113,11 +113,15 @@ class AdminEmployeesControllerCore extends AdminController
if ($theme[0] != '.' && is_dir($path.$theme) && (file_exists($path.$theme.'/css/admin.css') || file_exists($path.$theme.'/css/admin-theme.css'))) if ($theme[0] != '.' && is_dir($path.$theme) && (file_exists($path.$theme.'/css/admin.css') || file_exists($path.$theme.'/css/admin-theme.css')))
$this->themes[] = $theme; $this->themes[] = $theme;
$home_tab = Tab::getInstanceFromClassName('AdminDashboard'); $home_tab = Tab::getInstanceFromClassName('AdminDashboard', $this->context->language->id);
$this->tabs_list[$home_tab->id] = array( $this->tabs_list[$home_tab->id] = array(
'name' => $home_tab->name[$this->context->language->id], 'name' => $home_tab->name,
'id_tab' => $home_tab->id,
'children' => array(array(
'id_tab' => $home_tab->id, 'id_tab' => $home_tab->id,
'children' => array(array('id_tab' =>$home_tab->id, 'name' => $home_tab->name[$this->context->language->id]))); 'name' => $home_tab->name
))
);
foreach (Tab::getTabs($this->context->language->id, 0) as $tab) foreach (Tab::getTabs($this->context->language->id, 0) as $tab)
{ {
if (Tab::checkTabRights($tab['id_tab'])) if (Tab::checkTabRights($tab['id_tab']))