mirror of
https://github.com/plankanban/planka.git
synced 2025-12-18 17:23:21 +03:00
fix: Fix missing board memberships loading
This commit is contained in:
@@ -7,7 +7,7 @@ module.exports = {
|
|||||||
|
|
||||||
let boardMemberships = await sails.helpers.users.getBoardMemberships(currentUser.id);
|
let boardMemberships = await sails.helpers.users.getBoardMemberships(currentUser.id);
|
||||||
|
|
||||||
let membershipBoardIds = sails.helpers.utils.mapRecords(boardMemberships, 'boardId');
|
const membershipBoardIds = sails.helpers.utils.mapRecords(boardMemberships, 'boardId');
|
||||||
|
|
||||||
let membershipBoards = await sails.helpers.boards.getMany({
|
let membershipBoards = await sails.helpers.boards.getMany({
|
||||||
id: membershipBoardIds,
|
id: membershipBoardIds,
|
||||||
@@ -21,16 +21,6 @@ module.exports = {
|
|||||||
|
|
||||||
membershipProjectIds = sails.helpers.utils.mapRecords(membershipProjects);
|
membershipProjectIds = sails.helpers.utils.mapRecords(membershipProjects);
|
||||||
|
|
||||||
membershipBoards = membershipBoards.filter((membershipBoard) =>
|
|
||||||
membershipProjectIds.includes(membershipBoard.projectId),
|
|
||||||
);
|
|
||||||
|
|
||||||
membershipBoardIds = sails.helpers.utils.mapRecords(membershipBoards);
|
|
||||||
|
|
||||||
boardMemberships = boardMemberships.filter((boardMembership) =>
|
|
||||||
membershipBoardIds.includes(boardMembership.boardId),
|
|
||||||
);
|
|
||||||
|
|
||||||
const projectIds = [...managerProjectIds, ...membershipProjectIds];
|
const projectIds = [...managerProjectIds, ...membershipProjectIds];
|
||||||
const projects = [...managerProjects, ...membershipProjects];
|
const projects = [...managerProjects, ...membershipProjects];
|
||||||
|
|
||||||
@@ -40,7 +30,17 @@ module.exports = {
|
|||||||
const users = await sails.helpers.users.getMany(userIds);
|
const users = await sails.helpers.users.getMany(userIds);
|
||||||
|
|
||||||
const managerBoards = await sails.helpers.projects.getBoards(managerProjectIds);
|
const managerBoards = await sails.helpers.projects.getBoards(managerProjectIds);
|
||||||
|
|
||||||
|
membershipBoards = membershipBoards.filter((membershipBoard) =>
|
||||||
|
membershipProjectIds.includes(membershipBoard.projectId),
|
||||||
|
);
|
||||||
|
|
||||||
const boards = [...managerBoards, ...membershipBoards];
|
const boards = [...managerBoards, ...membershipBoards];
|
||||||
|
const boardIds = sails.helpers.utils.mapRecords(boards);
|
||||||
|
|
||||||
|
boardMemberships = boardMemberships.filter((boardMembership) =>
|
||||||
|
boardIds.includes(boardMembership.boardId),
|
||||||
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
items: projects,
|
items: projects,
|
||||||
|
|||||||
Reference in New Issue
Block a user