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

// Remove BO themes

Browse Source
This commit is contained in:
tDidierjean
2011-11-18 10:27:07 +00:00
parent 48c00e4e5e
commit 00f61bc35b
84 changed files with 15 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Dispatcher.php
+9 -9
View File
@@ -281,7 +281,7 @@ class DispatcherCore
$controllers = self::getControllers($this->controller_directories);
if (!isset($controllers[$this->controller]))
$this->controller = strtolower($this->controller_not_found);
$this->controller_class = $controllers[$this->controller];
$controller_class = $controllers[$this->controller];
}
// BO dispatch
else
@@ -292,18 +292,18 @@ class DispatcherCore
{
// We need controller_not_found to be the camelcase controller name
$this->controller = strtolower($this->controller_not_found);
$this->controller_class = $this->controller_not_found;
$controller_class = $this->controller_not_found;
}
else
$this->controller_class = $controller_row['class_name'];
$controller_class = $controller_row['class_name'];
// If Tab/Controller is in module, include it
if (!empty($controller_row['module']))
$controller_type = self::includeModuleClass($controller_row['module'], $this->controller_class);
$controller_type = self::includeModuleClass($controller_row['module'], $controller_class);
// If it is an AdminTab, include it
elseif (file_exists(_PS_ADMIN_DIR_.'/tabs/'.$this->controller_class.'.php'))
elseif (file_exists(_PS_ADMIN_DIR_.'/tabs/'.$controller_class.'.php'))
{
include(_PS_ADMIN_DIR_.'/tabs/'.$this->controller_class.'.php');
include(_PS_ADMIN_DIR_.'/tabs/'.$controller_class.'.php');
$controller_type = 'tab';
}
// For retrocompatibility with admin/tabs/ old system
@@ -311,17 +311,17 @@ class DispatcherCore
{
require_once(_PS_ADMIN_DIR_.'/functions.php');
$ajaxMode = !empty($_REQUEST['ajaxMode']);
runAdminTab($this->controller_class, $ajaxMode);
runAdminTab($controller_class, $ajaxMode);
return;
}
$this->controller_class = $this->controller_class.'Controller';
$controller_class = $controller_class.'Controller';
}
// Instantiate controller
try
{
Controller::getController($this->controller_class)->run();
Controller::getController($controller_class)->run();
}
catch (PrestashopException $e)
{
classes/Employee.php
+1 -5
View File
@@ -59,9 +59,6 @@ class EmployeeCore extends ObjectModel
/** @var string employee's chosen theme */
public $bo_theme;
/** @var string / enum hover or click mode */
public $bo_uimode;
/** @var bool, true */
public $bo_show_screencast;
@@ -74,7 +71,7 @@ class EmployeeCore extends ObjectModel
protected $fieldsSize = array('lastname' => 32, 'firstname' => 32, 'email' => 128, 'passwd' => 32, 'bo_color' => 32, 'bo_theme' => 32);
protected $fieldsValidate = array('lastname' => 'isName', 'firstname' => 'isName', 'email' => 'isEmail', 'id_lang' => 'isUnsignedInt',
'passwd' => 'isPasswdAdmin', 'active' => 'isBool', 'id_profile' => 'isInt', 'bo_color' => 'isColor', 'bo_theme' => 'isGenericName',
'bo_uimode' => 'isGenericName', 'bo_show_screencast' => 'isBool');
'bo_show_screencast' => 'isBool');
protected $table = 'employee';
protected $identifier = 'id_employee';
@@ -112,7 +109,6 @@ class EmployeeCore extends ObjectModel
$fields['bo_color'] = pSQL($this->bo_color);
$fields['bo_theme'] = pSQL($this->bo_theme);
$fields['bo_uimode'] = pSQL($this->bo_uimode);
$fields['bo_show_screencast'] = (int)$this->bo_show_screencast;
$fields['active'] = (int)$this->active;