Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-03-07 22:22:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'edge' into edge

Browse source
This commit is contained in:
Akuket 2018-10-09 14:49:12 +02:00 • committed by GitHub
commit 28a01862d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 344 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,10 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
const view = this;
const currentBoard = Boards.findOne(Session.get('currentBoard'));
const knowedUsers = currentBoard.members.map((member) => {
member.username = Users.findOne(member.userId).username;
const u = Users.findOne(member.userId);
if(u){
member.username = u.username;
}
return member;
});
const mentionRegex = /\B@([\w.]*)/gi;