lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load default values into $user->default_values

Browse Source
This commit is contained in:
Laurent Destailleur 2017-04-14 12:39:11 +02:00
parent e6e9b65594
commit 4818b1ba44
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/admin/defaultvalues.php
View File

@ -259,7 +259,6 @@ if ($result)
{ {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $i = 0;
$var=false;
while ($i < $num) while ($i < $num)
{ {

29
htdocs/user/class/user.class.php
View File

@ -104,15 +104,16 @@ class User extends CommonObject
public $lang; public $lang;
public $rights; // Array of permissions user->rights->permx public $rights; // Array of permissions user->rights->permx
public $all_permissions_are_loaded; /**< \private all_permissions_are_loaded */ public $all_permissions_are_loaded; // All permission are loaded
private $_tab_loaded=array(); // Array of cache of already loaded permissions public $nb_rights; // Number of rights granted to the user
public $nb_rights; // Number of rights granted to the user private $_tab_loaded=array(); // Cache array of already loaded permissions
public $conf; // To store personal config public $conf; // To store personal config
var $oldcopy; // To contains a clone of this when we need to save old properties of object public $default_values; // To store default values for user
public $users; // To store all tree of users hierarchy public $users; // To store all tree of users hierarchy
public $parentof; // To store an array of all parents for all ids. public $parentof; // To store an array of all parents for all ids.
private $cache_childids;
public $accountancy_code; // Accountancy code in prevision of the complete accountancy module public $accountancy_code; // Accountancy code in prevision of the complete accountancy module
@ -127,7 +128,6 @@ class User extends CommonObject
public $dateemployment; // Define date of employment by company public $dateemployment; // Define date of employment by company
private $cache_childids;
/** /**
@ -339,6 +339,7 @@ class User extends CommonObject
// To get back the global configuration unique to the user // To get back the global configuration unique to the user
if ($loadpersonalconf) if ($loadpersonalconf)
{ {
// Load user->conf for user
$sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param"; $sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param";
$sql.= " WHERE fk_user = ".$this->id; $sql.= " WHERE fk_user = ".$this->id;
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
@ -362,6 +363,24 @@ class User extends CommonObject
$this->error=$this->db->error(); $this->error=$this->db->error();
return -2; return -2;
} }
// Load user->default_values for user. TODO Save this in memcached ?
$sql = "SELECT rowid, entity, type, page, param, value";
$sql.= " FROM ".MAIN_DB_PREFIX."default_values";
$sql.= " WHERE entity IN (".$this->entity.",".$conf->entity.")";
$sql.= " AND user_id IN (0, ".$this->id.")";
$resql = $this->db->query($sql);
if ($resql)
{
while ($obj = $this->db->fetch_object($resql))
{
if (! empty($obj->page) && ! empty($obj->type) && ! empty($obj->param))
{
$user->default_values[$obj->page][$obj->type][$obj->param]=$obj->value;
}
}
$this->db->free($resql);
}
} }
return 1; return 1;