Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-18 00:10:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

User mentions now return @username (full name) - part 2

Browse source
This commit is contained in:
Ben0it-T 2022-01-02 19:35:47 +01:00
parent a160b662ef
commit 4589c3df15
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
client/components/main/editor.js
View file

@ -22,25 +22,22 @@ BlazeComponent.extendComponent({
const user = Users.findOne(member.userId);
const username = user.username;
const fullName = user.profile && user.profile !== undefined && user.profile.fullname ? user.profile.fullname : "";
// return username.includes(term) || fullName.includes(term) ? fullName + "(" + username + ")" : null;
if (username.includes(term) || fullName.includes(term)) {
if (fullName) {
return username + " (" + fullName + ")";
}
else {
return username;
}
}
return null;
return username.includes(term) || fullName.includes(term) ? user : null;
})
.filter(Boolean), [...specialHandleNames])
.filter(Boolean), [...specialHandles])
);
},
template(value) {
return value;
template(user) {
if (user.profile && user.profile.fullname) {
return (user.profile.fullname + " (" + user.username + ")");
}
return user.username;
},
replace(username) {
return `@${username} `;
replace(user) {
if (user.profile && user.profile.fullname) {
return `@${user.username} (${user.profile.fullname}) `;
}
return `@${user.username} `;
},
index: 1,
},