From efd9337c9f2dfca4fbe34ee067e1d24a2a663ff1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 May 2014 12:55:00 +0200
Subject: [PATCH] Fix: Hierarchy view with multicompany
---
htdocs/user/class/user.class.php | 5 ++++-
htdocs/user/hierarchy.php | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index f62467e0a67..00bf221d339 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2227,13 +2227,15 @@ class User extends CommonObject
*/
function get_full_tree($markafterid=0)
{
+ global $conf,$user;
+
$this->users = array();
// Init this->parentof that is array(id_son=>id_parent, ...)
$this->load_parentof();
// Init $this->users array
- $sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.login, u.statut"; // Distinct reduce pb with old tables with duplicates
+ $sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.login, 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))))
{
@@ -2257,6 +2259,7 @@ class User extends CommonObject
$this->users[$obj->rowid]['lastname'] = $obj->lastname;
$this->users[$obj->rowid]['login'] = $obj->login;
$this->users[$obj->rowid]['statut'] = $obj->statut;
+ $this->users[$obj->rowid]['entity'] = $obj->entity;
$i++;
}
}
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 0f2ccff204d..28ce9e61be3 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -78,7 +78,7 @@ foreach($fulltree as $key => $val)
$userstatic->firstname=$val['firstname'];
$userstatic->lastname=$val['name'];
$userstatic->statut=$val['statut'];
- $li=$userstatic->getNomUrl(1,'').' ('.$val['login'].')';
+ $li=$userstatic->getNomUrl(1,'').' ('.$val['login'].(empty($conf->multicompany->enabled)?'':' - '.$langs->trans("Instance").' '.$val['entity']).')';
$data[] = array(
'rowid'=>$val['rowid'],
--
GitLab