Skip to content

Commit 0be20ef

Browse files
committed
minor
1 parent 2d00910 commit 0be20ef

File tree

1 file changed

+13
-7
lines changed
  • services/static-webserver/client/source/class/osparc/data/model

1 file changed

+13
-7
lines changed

services/static-webserver/client/source/class/osparc/data/model/User.js

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,24 @@ qx.Class.define("osparc.data.model.User", {
2828
construct: function(userData) {
2929
this.base(arguments);
3030

31-
const label = this.self().namesToLabel(userData["first_name"], userData["last_name"]) || userData["login"];
32-
const thumbnail = this.self().emailToThumbnail(userData.login);
31+
let label = userData["login"];
32+
if (userData["first_name"]) {
33+
label = qx.lang.String.firstUp(userData["first_name"]);
34+
if (userData["last_name"]) {
35+
label += " " + qx.lang.String.firstUp(userData["last_name"]);
36+
}
37+
}
38+
const thumbnail = this.self().emailToThumbnail(userData["login"]);
3339
this.set({
34-
userId: userData.id,
35-
groupId: userData.gid,
40+
userId: userData["id"],
41+
groupId: userData["gid"],
3642
label: label,
3743
username: userData["username"] || "",
3844
firstName: userData["first_name"],
3945
lastName: userData["last_name"],
40-
email: userData.login,
41-
thumbnail: thumbnail,
42-
accessRights: userData.accessRights,
46+
email: userData["login"],
47+
thumbnail,
48+
accessRights: userData["accessRights"],
4349
});
4450
},
4551

0 commit comments

Comments
 (0)