starred/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-12-17 17:23:25 +03:00
Code Issues 418 Packages Projects Releases 12 Wiki Activity

Fix loading deleted users on actions fetch. Closes #62

Browse Source
This commit is contained in:
Maksim Eltyshev
2020-12-13 23:17:12 +05:00
parent 6fc8ec8a2d
commit cbadbeb239
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/api/controllers/actions/index.js
View File

@@ -42,7 +42,7 @@ module.exports = {
const actions = await sails.helpers.getActionsForCard(inputs.cardId, inputs.beforeId); const actions = await sails.helpers.getActionsForCard(inputs.cardId, inputs.beforeId);
const userIds = sails.helpers.mapRecords(actions, 'userId', true); const userIds = sails.helpers.mapRecords(actions, 'userId', true);
const users = await sails.helpers.getUsers(userIds); const users = await sails.helpers.getUsers(userIds, true);
return exits.success({ return exits.success({
items: actions, items: actions,

12
server/api/helpers/get-users.js
View File

@@ -4,12 +4,14 @@ module.exports = {
type: 'json', type: 'json',
custom: (value) => _.isArray(value) || _.isPlainObject(value), custom: (value) => _.isArray(value) || _.isPlainObject(value),
}, },
withDeleted: {
type: 'boolean',
defaultsTo: false,
},
}, },
async fn(inputs, exits) { async fn(inputs, exits) {
const criteria = { const criteria = {};
deletedAt: null,
};
if (_.isArray(inputs.criteria)) { if (_.isArray(inputs.criteria)) {
criteria.id = inputs.criteria; criteria.id = inputs.criteria;
@@ -17,6 +19,10 @@ module.exports = {
Object.assign(criteria, inputs.criteria); Object.assign(criteria, inputs.criteria);
} }
if (!inputs.withDeleted) {
criteria.deletedAt = null;
}
const users = await User.find(criteria).sort('id'); const users = await User.find(criteria).sort('id');
return exits.success(users); return exits.success(users);