diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-08-15 13:16:34 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-08-15 13:16:34 +0300 |
commit | 5c696e5a3c70d31a7af6e47cbcf691f6c18eb384 (patch) | |
tree | 7878843b265b9a2838297f7218c6849df7a99793 | |
parent | ebf3e2e65b4576824982516e2140f96f195c3a93 (diff) | |
download | wekan-5c696e5a3c70d31a7af6e47cbcf691f6c18eb384.tar.gz wekan-5c696e5a3c70d31a7af6e47cbcf691f6c18eb384.tar.bz2 wekan-5c696e5a3c70d31a7af6e47cbcf691f6c18eb384.zip |
On board, BoardAdmin and normal user can now invite new user directly
with email address, without using Admin Panel or registering at /sign-up.
Closes #2060
Revert permission change.
Related https://github.com/wekan/wekan/commit/9f6d615ee5bbdb7552e6bdcae75a76a7f74fef7a#commitcomment-34636513
Opens #2590
Thanks to xet7 !
-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..d497d5a5 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(); |