Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

On board, BoardAdmin and normal user can now invite new user directly

Browse source 
with email address, without using Admin Panel or registering at /sign-up.
Closes #2060

Revert permission change.
Related 9f6d615ee5 (commitcomment-34636513)
Opens #2590

Thanks to xet7 !
This commit is contained in:
Lauri Ojansivu 2019-08-15 13:16:34 +03:00
parent ebf3e2e65b
commit 5c696e5a3c
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
models/users.js
View file

@ -260,7 +260,7 @@ Users.attachSchema(
Users.allow({ Users.allow({
update(userId) { update(userId) {
const user = Users.findOne(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) { remove(userId, doc) {
const adminsNumber = Users.find({ isAdmin: true }).count(); const adminsNumber = Users.find({ isAdmin: true }).count();
@ -610,8 +610,9 @@ if (Meteor.isServer) {
board && board &&
board.members && board.members &&
_.contains(_.pluck(board.members, 'userId'), inviter._id) && _.contains(_.pluck(board.members, 'userId'), inviter._id) &&
_.where(board.members, { userId: inviter._id })[0].isActive && _.where(board.members, { userId: inviter._id })[0].isActive;
_.where(board.members, { userId: inviter._id })[0].isAdmin; // GitHub issue 2060
//_.where(board.members, { userId: inviter._id })[0].isAdmin;
if (!allowInvite) throw new Meteor.Error('error-board-notAMember'); if (!allowInvite) throw new Meteor.Error('error-board-notAMember');
this.unblock(); this.unblock();