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

fix(tasks): more lock icon revision, no error on manager uncheck

Browse Source
This commit is contained in:
Sabe Jones
2021-05-19 16:25:51 -05:00
committed by SabreCat
parent 99bf6349e1
commit 221dd7a81e
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/client/src/components/tasks/task.vue
View File

@@ -1046,17 +1046,17 @@ export default {
showTaskLockIcon () { showTaskLockIcon () {
if (this.isUser) return false; if (this.isUser) return false;
if (this.isGroupTask) { if (this.isGroupTask) {
if (this.isOpenTask) { if (this.task.completed) {
if (!this.task.completed) return false;
if (this.task.group.completedBy === this.user._id) return false; if (this.task.group.completedBy === this.user._id) return false;
if (this.teamManagerAccess) return false;
return true; return true;
} }
if (this.isOpenTask) return false;
if (this.task.group.assignedUsers.indexOf(this.user._id) !== -1) return false; if (this.task.group.assignedUsers.indexOf(this.user._id) !== -1) return false;
if ( if (
this.task.group.assignedUsers.length > 0 this.task.group.assignedUsers.length > 0
&& this.task.group.assignedUsers.indexOf(this.user._id) === -1 && this.task.group.assignedUsers.indexOf(this.user._id) === -1
) return true; ) return true;
if (this.teamManagerAccess) return false;
} }
return true; return true;
}, },

30
website/server/libs/tasks/index.js
View File

@@ -337,22 +337,6 @@ async function scoreTask (user, task, direction, req, res) {
} }
let localTask; let localTask;
if (task.group.id && !task.userId && task.group.assignedUsers.length > 0) {
// Task is being scored from team board, and a user copy should exist
if (!task.group.assignedUsers.includes(user._id)) {
throw new BadRequest('Task has not been assigned to this user.');
}
localTask = await Tasks.Task.findOne(
{ userId: user._id, 'group.taskId': task._id },
).exec();
if (!localTask) throw new NotFound('Task not found.');
}
const wasCompleted = task.completed;
const firstTask = !user.achievements.completedTask;
let delta;
let rollbackUser; let rollbackUser;
if ( if (
@@ -372,8 +356,22 @@ async function scoreTask (user, task, direction, req, res) {
} }
rollbackUser = await User.findOne({ _id: task.group.completedBy }); rollbackUser = await User.findOne({ _id: task.group.completedBy });
task.group.completedBy = undefined; task.group.completedBy = undefined;
} else if (task.group.id && !task.userId && task.group.assignedUsers.length > 0) {
// Task is being scored from team board, and a user copy should exist
if (!task.group.assignedUsers.includes(user._id)) {
throw new BadRequest('Task has not been assigned to this user.');
}
localTask = await Tasks.Task.findOne(
{ userId: user._id, 'group.taskId': task._id },
).exec();
if (!localTask) throw new NotFound('Task not found.');
} }
const wasCompleted = task.completed;
const firstTask = !user.achievements.completedTask;
let delta;
if (rollbackUser) { if (rollbackUser) {
delta = shared.ops.scoreTask({ task, user: rollbackUser, direction }, req, res.analytics); delta = shared.ops.scoreTask({ task, user: rollbackUser, direction }, req, res.analytics);
await rollbackUser.save(); await rollbackUser.save();