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

FIX The admin flag is mising.

Browse Source
This commit is contained in:
Laurent Destailleur 2015-10-05 23:53:49 +02:00
parent f1cf629b80
commit 9f2bcf0e4f
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2358,7 +2358,7 @@ class User extends CommonObject
$this->load_parentof(); $this->load_parentof();
// Init $this->users array // Init $this->users array
$sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.statut, u.entity"; // Distinct reduce pb with old tables with duplicates $sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.admin, u.statut, u.entity"; // Distinct reduce pb with old tables with duplicates
$sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->multicompany->transverse_mode) || (! empty($user->admin) && empty($user->entity)))) if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->multicompany->transverse_mode) || (! empty($user->admin) && empty($user->entity))))
{ {
@ -2388,6 +2388,7 @@ class User extends CommonObject
$this->users[$obj->rowid]['entity'] = $obj->entity; $this->users[$obj->rowid]['entity'] = $obj->entity;
$this->users[$obj->rowid]['email'] = $obj->email; $this->users[$obj->rowid]['email'] = $obj->email;
$this->users[$obj->rowid]['gender'] = $obj->gender; $this->users[$obj->rowid]['gender'] = $obj->gender;
$this->users[$obj->rowid]['admin'] = $obj->admin;
$i++; $i++;
} }
} }

15
htdocs/user/hierarchy.php
View File

@ -88,7 +88,9 @@ foreach($fulltree as $key => $val)
$userstatic->email=$val['email']; $userstatic->email=$val['email'];
$userstatic->gender=$val['gender']; $userstatic->gender=$val['gender'];
$userstatic->societe_id=$val['fk_soc']; $userstatic->societe_id=$val['fk_soc'];
$userstatic->admin=$val['admin'];
$userstatic->entity=$val['entity'];
$entity=$val['entity']; $entity=$val['entity'];
$entitystring=''; $entitystring='';
@ -109,7 +111,16 @@ foreach($fulltree as $key => $val)
} }
} }
$li=$userstatic->getNomUrl(1,'').' ('.$val['login'].($entitystring?' - '.$entitystring:'').')'; $li=$userstatic->getNomUrl(1,'',0,1);
if (! empty($conf->multicompany->enabled) && $userstatic->admin && ! $userstatic->entity)
{
$li.=img_picto($langs->trans("SuperAdministrator"),'redstar');
}
else if ($userstatic->admin)
{
$li.=img_picto($langs->trans("Administrator"),'star');
}
$li.=' ('.$val['login'].($entitystring?' - '.$entitystring:'').')';
$data[] = array( $data[] = array(
'rowid'=>$val['rowid'], 'rowid'=>$val['rowid'],