summaryrefslogtreecommitdiffstats
path: root/client/components/main
diff options
context:
space:
mode:
authorAkuket <32392661+Akuket@users.noreply.github.com>2018-10-09 14:49:12 +0200
committerGitHub <noreply@github.com>2018-10-09 14:49:12 +0200
commit28a01862d04654784bd6010035c3a6fe1690ba60 (patch)
treeee52d3c84b12f5ada9a3faf12925dd5806385a91 /client/components/main
parent3b4f285fea4a90ee96bfce855e1539adcec9b7aa (diff)
parent58855ada97677d25475ba4721834c0f576ed3b47 (diff)
downloadwekan-28a01862d04654784bd6010035c3a6fe1690ba60.tar.gz
wekan-28a01862d04654784bd6010035c3a6fe1690ba60.tar.bz2
wekan-28a01862d04654784bd6010035c3a6fe1690ba60.zip
Merge branch 'edge' into edge
Diffstat (limited to 'client/components/main')
-rwxr-xr-xclient/components/main/editor.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 888fbe00..20ece562 100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -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;