From d882635e8a6cc19becac1113b418c168f60b655b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.bernigaud@opensides.be>
Date: Mon, 25 Apr 2016 10:13:50 +0200
Subject: [PATCH] Fixes #4678 Always showing users login in ogroup member list
---
plugins/admin/groups/class_ogroup.inc | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/admin/groups/class_ogroup.inc
index af4d93607..7af183244 100644
--- a/plugins/admin/groups/class_ogroup.inc
+++ b/plugins/admin/groups/class_ogroup.inc
@@ -42,10 +42,14 @@ class ObjectsAttribute extends GenericDialogAttribute
$infos = objects::infos($objectType);
$this->types[$i] = $code;
$this->displays[$i] = $attrs[$infos['nameAttr']][0];
- if (isset($attrs['description'][0])) {
+ if ($objectType == 'user') {
+ if (isset($attrs['description'][0])) {
+ $this->displays[$i] .= ' ['.$attrs['uid'][0].' - '.$attrs['description'][0].']';
+ } else {
+ $this->displays[$i] .= ' ['.$attrs['uid'][0].']';
+ }
+ } elseif (isset($attrs['description'][0])) {
$this->displays[$i] .= ' ['.$attrs['description'][0].']';
- } elseif (isset($attrs['uid'][0])) {
- $this->displays[$i] .= ' ['.$attrs['uid'][0].']';
}
break;
}
--
GitLab