summaryrefslogtreecommitdiffstats
path: root/client/components/main/editor.js
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-12-24 18:18:41 +0200
committerLauri Ojansivu <x@xet7.org>2018-12-24 18:18:41 +0200
commitc502ab95009fc5814f1b96b45c6503313551578d (patch)
tree1f27c25b9d27755cd3ae0c3f5ace871f80c58c8d /client/components/main/editor.js
parent425ae5542227ecbb8bae0acd62d553d64b4d893c (diff)
downloadwekan-c502ab95009fc5814f1b96b45c6503313551578d.tar.gz
wekan-c502ab95009fc5814f1b96b45c6503313551578d.tar.bz2
wekan-c502ab95009fc5814f1b96b45c6503313551578d.zip
- Revert "Improve authentication" and "Default Authentication Method"
to make login work again. - Fixes to docker-compose.yml so that Wekan Meteor 1.6.x version would work. Most likely Meteor 1.8.x version is still broken. Thanks to xet7 !
Diffstat (limited to 'client/components/main/editor.js')
-rwxr-xr-xclient/components/main/editor.js13
1 files changed, 4 insertions, 9 deletions
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 152f69e2..20ece562 100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -9,12 +9,10 @@ Template.editor.onRendered(() => {
match: /\B@([\w.]*)$/,
search(term, callback) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
- if (currentBoard) {
- callback(currentBoard.activeMembers().map((member) => {
- const username = Users.findOne(member.userId).username;
- return username.includes(term) ? username : null;
- }).filter(Boolean));
- }
+ callback(currentBoard.activeMembers().map((member) => {
+ const username = Users.findOne(member.userId).username;
+ return username.includes(term) ? username : null;
+ }).filter(Boolean));
},
template(value) {
return value;
@@ -39,9 +37,6 @@ const at = HTML.CharRef({html: '&commat;', 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){