diff options
author | Romulus Urakagi Tsai <urakagi@gmail.com> | 2019-08-16 07:43:55 +0000 |
---|---|---|
committer | Romulus Urakagi Tsai <urakagi@gmail.com> | 2019-08-16 07:43:55 +0000 |
commit | b794c22ac071612fd1962758d54cdb2e15269d79 (patch) | |
tree | ec429fdeef049a5ebd48c3c7d96e41f0837b208e /models | |
parent | b778cea34f8d0764fbe2ab28b43b6201edd94f41 (diff) | |
parent | a1582c3e653ba0075e3cdd5588d226c915c63580 (diff) | |
download | wekan-b794c22ac071612fd1962758d54cdb2e15269d79.tar.gz wekan-b794c22ac071612fd1962758d54cdb2e15269d79.tar.bz2 wekan-b794c22ac071612fd1962758d54cdb2e15269d79.zip |
Merge branch 'master' of https://github.com/wekan/wekan
Diffstat (limited to 'models')
-rw-r--r-- | models/users.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/models/users.js b/models/users.js index 870e8fe9..1adb4a57 100644 --- a/models/users.js +++ b/models/users.js @@ -260,7 +260,7 @@ Users.attachSchema( Users.allow({ update(userId) { const user = Users.findOne(userId); - return user; // && Meteor.user().isAdmin; // GitHub issue #2590 + return user && Meteor.user().isAdmin; // GitHub issue #2590 }, remove(userId, doc) { const adminsNumber = Users.find({ isAdmin: true }).count(); @@ -610,8 +610,9 @@ if (Meteor.isServer) { board && board.members && _.contains(_.pluck(board.members, 'userId'), inviter._id) && - _.where(board.members, { userId: inviter._id })[0].isActive && - _.where(board.members, { userId: inviter._id })[0].isAdmin; + _.where(board.members, { userId: inviter._id })[0].isActive; + // GitHub issue 2060 + //_.where(board.members, { userId: inviter._id })[0].isAdmin; if (!allowInvite) throw new Meteor.Error('error-board-notAMember'); this.unblock(); |