Skip to content

Commit f0a02c7

Browse files
committed
label and description for User
1 parent 1c20d4e commit f0a02c7

File tree

2 files changed

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

2 files changed

+13
-4
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ qx.Class.define("osparc.data.model.Group", {
104104
return Object.values(this.getGroupMembers()).find(user => user.getUserId() === userId);
105105
},
106106

107+
getGroupMemberByUsername: function(username) {
108+
return Object.values(this.getGroupMembers()).find(user => user.getUsername() === username);
109+
},
110+
107111
getGroupMemberByLogin: function(userEmail) {
108112
return Object.values(this.getGroupMembers()).find(user => user.getEmail() === userEmail);
109113
},

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

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

31-
let label = userData["login"];
31+
let description = "";
3232
if (userData["first_name"]) {
33-
label = qx.lang.String.firstUp(userData["first_name"]);
33+
description = userData["first_name"];
3434
if (userData["last_name"]) {
35-
label += " " + qx.lang.String.firstUp(userData["last_name"]);
35+
description += " " + userData["last_name"];
3636
}
37+
description += " | ";
38+
}
39+
if (userData["login"]) {
40+
description += userData["login"];
3741
}
3842
const thumbnail = osparc.utils.Avatar.emailToThumbnail(userData["login"]);
3943
this.set({
4044
userId: userData["id"],
4145
groupId: userData["gid"],
42-
label: label,
4346
username: userData["username"] || "",
4447
firstName: userData["first_name"],
4548
lastName: userData["last_name"],
4649
email: userData["login"],
50+
label: userData["username"],
51+
description,
4752
thumbnail,
4853
});
4954
},

0 commit comments

Comments
 (0)