diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index b1b7819985c..e375a3c3d80 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -2358,7 +2358,7 @@ class User extends CommonObject $this->load_parentof(); // 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"; 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]['email'] = $obj->email; $this->users[$obj->rowid]['gender'] = $obj->gender; + $this->users[$obj->rowid]['admin'] = $obj->admin; $i++; } } diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php index ccaf6687da9..ca37b1ff2d3 100644 --- a/htdocs/user/hierarchy.php +++ b/htdocs/user/hierarchy.php @@ -88,7 +88,9 @@ foreach($fulltree as $key => $val) $userstatic->email=$val['email']; $userstatic->gender=$val['gender']; $userstatic->societe_id=$val['fk_soc']; - + $userstatic->admin=$val['admin']; + $userstatic->entity=$val['entity']; + $entity=$val['entity']; $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( 'rowid'=>$val['rowid'],