diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-12-21 20:53:31 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-12-21 20:53:31 +0200 |
commit | db44b8ea54ef8c8296ba864e699775456c311437 (patch) | |
tree | 358213ea869cc8b5b52f42b9cb6a6924c63a1947 /client/components/main/editor.js | |
parent | ac6f8e85519da2b7eabcec6e598c96b5fb9a2cfa (diff) | |
parent | 1f512c8ba1396f9c512f6b2bccd9ffe9417c4cf4 (diff) | |
download | wekan-db44b8ea54ef8c8296ba864e699775456c311437.tar.gz wekan-db44b8ea54ef8c8296ba864e699775456c311437.tar.bz2 wekan-db44b8ea54ef8c8296ba864e699775456c311437.zip |
Merge branch 'Akuket-devel' into devel
Diffstat (limited to 'client/components/main/editor.js')
-rwxr-xr-x | client/components/main/editor.js | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 20ece562..152f69e2 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -9,10 +9,12 @@ Template.editor.onRendered(() => { match: /\B@([\w.]*)$/, search(term, callback) { const currentBoard = Boards.findOne(Session.get('currentBoard')); - callback(currentBoard.activeMembers().map((member) => { - const username = Users.findOne(member.userId).username; - return username.includes(term) ? username : null; - }).filter(Boolean)); + if (currentBoard) { + callback(currentBoard.activeMembers().map((member) => { + const username = Users.findOne(member.userId).username; + return username.includes(term) ? username : null; + }).filter(Boolean)); + } }, template(value) { return value; @@ -37,6 +39,9 @@ const at = HTML.CharRef({html: '@', str: '@'}); Blaze.Template.registerHelper('mentions', new Template('mentions', function() { const view = this; const currentBoard = Boards.findOne(Session.get('currentBoard')); + if (!currentBoard) { + return HTML.Raw(''); + } const knowedUsers = currentBoard.members.map((member) => { const u = Users.findOne(member.userId); if(u){ |