github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 04:57:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Fix: Some users cannot switch views or languages](https://github.com/wekan/wekan/issues/2630).

Browse source 
Thanks to xet7 and justinr1234.
This commit is contained in:
Lauri Ojansivu 2019-08-20 19:16:44 +03:00
parent a31ece0974
commit 6e12e2fa59
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
models/users.js
View file

@ -257,10 +257,23 @@ Users.attachSchema(
}),
);
Users.before.update(function(userId, fieldNames) {
const user = Users.findOne({ _id: userId });
if (user && user.isAdmin || Meteor.user() && Meteor.user().isAdmin) { return true; }
if (!user) { return false; }
if (_.contains(fieldNames, 'services')) { return false; }
if (_.contains(fieldNames, 'heartBeat')) { return false; }
if (_.contains(fieldNames, 'isAdmin')) { return false; }
if (_.contains(fieldNames, 'loginDisabled')) { return false; }
if (_.contains(fieldNames, 'authenticationMethod')) { return false; }
});
Users.allow({
update(userId) {
const user = Users.findOne(userId);
return user && Meteor.user().isAdmin; // GitHub issue #2590
update(userId, doc) {
const user = Users.findOne({ _id: userId });
if (user && user.isAdmin || Meteor.user() && Meteor.user().isAdmin) return true;
if (!user) { return false; }
return doc._id === userId;
},
remove(userId, doc) {
const adminsNumber = Users.find({ isAdmin: true }).count();