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

Update users.js etc with global search replace, to try to fix selecting correct user.

Browse source 
Thanks to xet7 !
This commit is contained in:
Lauri Ojansivu 2020-06-17 20:21:44 +03:00
parent ad87f9ff4e
commit f245b6b7fa
12 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
models/users.js
View file

@ -1277,7 +1277,7 @@ if (Meteor.isServer) {
JsonRoutes.add('GET', '/api/user', function(req, res) {
try {
Authentication.checkLoggedIn(req.userId);
const data = Meteor.users.findOne({ _id: req.userId });
const data = Users.findOne({ _id: req.userId });
delete data.services;
// get all boards where the user is member of
@ -1368,7 +1368,7 @@ if (Meteor.isServer) {
return u;
});
const user = Meteor.users.findOne({ _id: id });
const user = Users.findOne({ _id: id });
user.boards = boards;
JsonRoutes.sendResult(res, {
code: 200,
@ -1404,7 +1404,7 @@ if (Meteor.isServer) {
Authentication.checkUserId(req.userId);
const id = req.params.userId;
const action = req.body.action;
let data = Meteor.users.findOne({ _id: id });
let data = Users.findOne({ _id: id });
if (data !== undefined) {
if (action === 'takeOwnership') {
data = Boards.find(
@ -1437,7 +1437,7 @@ if (Meteor.isServer) {
} else if (action === 'enableLogin') {
Users.update({ _id: id }, { $set: { loginDisabled: '' } });
}
data = Meteor.users.findOne({ _id: id });
data = Users.findOne({ _id: id });
}
}
JsonRoutes.sendResult(res, {
@ -1481,7 +1481,7 @@ if (Meteor.isServer) {
const boardId = req.params.boardId;
const action = req.body.action;
const { isAdmin, isNoComments, isCommentOnly } = req.body;
let data = Meteor.users.findOne({ _id: userId });
let data = Users.findOne({ _id: userId });
if (data !== undefined) {
if (action === 'add') {
data = Boards.find({
@ -1542,7 +1542,7 @@ if (Meteor.isServer) {
const userId = req.params.userId;
const boardId = req.params.boardId;
const action = req.body.action;
let data = Meteor.users.findOne({ _id: userId });
let data = Users.findOne({ _id: userId });
if (data !== undefined) {
if (action === 'remove') {
data = Boards.find({