krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-14 21:27:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into sabrecat/teams-rebase

Browse Source
This commit is contained in:
SabreCat
2022-03-23 20:23:29 -05:00
parent c5ef803458 4eb4dc6ba3
commit 354f3578a2
63 changed files with 454 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
website/server/controllers/api-v3/tasks.js
View File

@@ -836,6 +836,32 @@ api.moveTask = {
// In memory updates
const order = owner.tasksOrder[`${task.type}s`];
if (order.indexOf(task._id) === -1) { // task is missing from list, list needs repair
const taskListQuery = { type: task.type };
if (group) {
taskListQuery['group.id'] = owner._id;
taskListQuery.userId = { $exists: false };
} else if (challenge) {
taskListQuery['challenge.id'] = owner._id;
taskListQuery.userId = { $exists: false };
} else {
taskListQuery.userId = owner._id;
}
const taskList = await Tasks.Task.find(
taskListQuery,
{ _id: 1 },
).exec();
for (const foundTask of taskList) {
if (order.indexOf(foundTask._id) === -1) {
order.push(foundTask._id);
}
}
const fixQuery = { $set: {} };
fixQuery.$set[`tasksOrder.${task.type}s`] = order;
await owner.update(fixQuery).exec();
}
moveTask(order, task._id, to);
// Server updates