Fixed issue #17869: User list in Survey group permission management i…

…s unclear (#2227) * Fixed issue #17869: User list in Survey group permission management is unclear Dev: add full_name in parenthesis Dev: create a getUserDescription to be used elsewhere * Dev: getDisplayName is better than getUserDescription
LimeSurvey · Apr 25, 2022 · 813de93 · 813de93
1 parent d03521b
commit 813de93
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/application/models/User.php b/application/models/User.php
@@ -936,4 +936,16 @@ public function setValidationExpiration()
 
         return $this->save();
     }
+
+    /**
+     * Get the decription to be used in list
+     * @return $string
+     */
+    public function getDisplayName()
+    {
+        if (empty($this->full_name)) {
+            return $this->users_name;
+        }
+        return sprintf(gt("%s (%s)"), $this->users_name, $this->full_name);
+    }
 }
diff --git a/application/views/admin/super/permissions/addUserForm.php b/application/views/admin/super/permissions/addUserForm.php
@@ -7,7 +7,11 @@
         <?php echo CHtml::dropDownList(
             'uid',
             '',
-            CHtml::listData($oAddUserList,'uid','users_name'),
+            CHtml::listData(
+                $oAddUserList,
+                'uid',
+                'DisplayName'
+            ),
             array(
                 'empty' => gT("Please choose..."),
                 'class'=> 'form-control',