Fix a bug in client name generation

ImageMarkup · Feb 28, 2017 · 22d70ef · 22d70ef
1 parent f821d4f
commit 22d70ef
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/web_external/models/UserModel.js b/web_external/models/UserModel.js
@@ -1,14 +1,24 @@
 isic.models.UserModel = girder.models.UserModel.extend({
     name: function () {
-        var name = this.get('name');
+        var realName;
         if (this.has('login')) {
-            var privateName =
+            realName =
                 this.get('firstName') +
                 ' ' + this.get('lastName') +
                 ' (' + this.get('login') + ')';
-            name += ' [' + privateName + ']';
         }
-        return name;
+
+        var displayName;
+        if (this.has('name')) {
+            displayName = this.get('name');
+            if (realName) {
+                displayName += ' [' + realName + ']';
+            }
+        } else {
+            // The user should always have either a 'login' or a 'name'
+            displayName = realName;
+        }
+        return displayName;
     },
 
     canAcceptTerms: function () {