// bugfix duplicated information (show_screenshot)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9731 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-10-28 16:12:05 +00:00
parent b230e4654d
commit 7d0bba4e03
+1 -5
View File
@@ -68,16 +68,13 @@ class EmployeeCore extends ObjectModel
/** @var boolean Status */ /** @var boolean Status */
public $active = 1; public $active = 1;
/** @var boolean show screencast */
public $show_screencast = 1;
public $remote_addr; public $remote_addr;
protected $fieldsRequired = array('lastname', 'firstname', 'email', 'passwd', 'id_profile', 'id_lang'); protected $fieldsRequired = array('lastname', 'firstname', 'email', 'passwd', 'id_profile', 'id_lang');
protected $fieldsSize = array('lastname' => 32, 'firstname' => 32, 'email' => 128, 'passwd' => 32, 'bo_color' => 32, 'bo_theme' => 32); 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', 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', 'passwd' => 'isPasswdAdmin', 'active' => 'isBool', 'id_profile' => 'isInt', 'bo_color' => 'isColor', 'bo_theme' => 'isGenericName',
'bo_uimode' => 'isGenericName', 'show_screencast' => 'isBool', 'bo_show_screencast' => 'isBool'); 'bo_uimode' => 'isGenericName', 'bo_show_screencast' => 'isBool');
protected $table = 'employee'; protected $table = 'employee';
protected $identifier = 'id_employee'; protected $identifier = 'id_employee';
@@ -118,7 +115,6 @@ class EmployeeCore extends ObjectModel
$fields['bo_uimode'] = pSQL($this->bo_uimode); $fields['bo_uimode'] = pSQL($this->bo_uimode);
$fields['bo_show_screencast'] = (int)$this->bo_show_screencast; $fields['bo_show_screencast'] = (int)$this->bo_show_screencast;
$fields['active'] = (int)$this->active; $fields['active'] = (int)$this->active;
$fields['show_screencast'] = (int)$this->show_screencast;
return $fields; return $fields;
} }