From c0473f0246b50b0661ee951ad922382c854e3af2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Dec 2014 13:13:11 +0100
Subject: [PATCH] Fixed: when transvers_mode is on, a user is not linked to a
dedicated environment (always entity 1), so we should not show info not
reliable with this mode.
---
htdocs/user/index.php | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index ac1ebc9e1c5..5d0b0ac77e4 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -114,6 +114,10 @@ if ($result)
print_liste_field_titre($langs->trans("LastName"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_societe",$param,"","",$sortfield,$sortorder);
+ if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))
+ {
+ print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder);
+ }
print_liste_field_titre($langs->trans("DateCreation"),$_SERVER['PHP_SELF'],"u.datec",$param,"",'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u2.login",$param,"",'align="center"',$sortfield,$sortorder);
@@ -165,9 +169,20 @@ if ($result)
$companystatic->canvas=$obj->canvas;
print $companystatic->getNomUrl(1);
}
+ else if ($obj->ldap_sid)
+ {
+ print $langs->trans("DomainUser");
+ }
+ else
+ {
+ print $langs->trans("InternalUser");
+ }
+ print '</td>';
+
// Multicompany enabled
- else if (! empty($conf->multicompany->enabled))
+ if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))
{
+ print '<td>';
if (! $obj->entity)
{
print $langs->trans("AllEntities");
@@ -181,16 +196,8 @@ if ($result)
print $mc->label;
}
}
+ print '</td>';
}
- else if ($obj->ldap_sid)
- {
- print $langs->trans("DomainUser");
- }
- else
- {
- print $langs->trans("InternalUser");
- }
- print '</td>';
// Date creation
print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datec),"dayhour").'</td>';
--
GitLab