Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-03-05 21:30:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' of https://github.com/wekan/wekan

Browse source
This commit is contained in:
Romulus Urakagi Tsai 2019-08-16 07:43:55 +00:00
commit b794c22ac0
76 changed files with 299 additions and 71 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({
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();