Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-04 07:31:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'admin-reports' of supplee.net:wekan

Browse source 
# Conflicts:
#	i18n/en.i18n.json
This commit is contained in:
John Supplee 2021-05-31 13:59:40 -04:00
commit 30a29e23d3
7 changed files with 123 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

16
models/boards.js
View file

@ -1294,7 +1294,12 @@ Boards.userSearch = (
return Boards.find(selector, projection);
};
Boards.userBoards = (userId, archived = false, selector = {}) => {
Boards.userBoards = (
userId,
archived = false,
selector = {},
projection = {},
) => {
if (typeof archived === 'boolean') {
selector.archived = archived;
}
@ -1304,13 +1309,18 @@ Boards.userBoards = (userId, archived = false, selector = {}) => {
selector.$or = [{ permission: 'public' }];
if (userId) {
selector.$or.push({ members: { $elemMatch: { userId, isActive: true } } });
selector.$or.push(
{ members: { $elemMatch: { userId, isActive: true } } },
projection,
);
}
return Boards.find(selector);
};
Boards.userBoardIds = (userId, archived = false, selector = {}) => {
return Boards.userBoards(userId, archived, selector).map(board => {
return Boards.userBoards(userId, archived, selector, {
fields: { _id: 1 },
}).map(board => {
return board._id;
});
};