Fixes #4678 Always showing users login in ogroup member list

d882635e · Côme Chilliet · 0ced8156 · d882635e
Commit d882635e authored 9 years ago by Côme Chilliet
Hide whitespace changes
Inline Side-by-side

Showing

with 7 additions and 3 deletions
+7 -3
--- 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;
          }