From 801b902bb822bebff53f9f2134ca838f00f046fa Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Wed, 19 May 2021 14:44:08 -0500 Subject: [PATCH] fix(tasks): manager lock icon, coerce task value to Number --- website/client/src/components/tasks/task.vue | 6 +++++- website/server/libs/tasks/index.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/website/client/src/components/tasks/task.vue b/website/client/src/components/tasks/task.vue index 1b59fb4600..29beeae6fa 100644 --- a/website/client/src/components/tasks/task.vue +++ b/website/client/src/components/tasks/task.vue @@ -1046,13 +1046,17 @@ export default { showTaskLockIcon () { if (this.isUser) return false; if (this.isGroupTask) { - if (this.teamManagerAccess) return false; if (this.isOpenTask) { if (!this.task.completed) return false; if (this.task.group.completedBy === this.user._id) return false; return true; } if (this.task.group.assignedUsers.indexOf(this.user._id) !== -1) return false; + if ( + this.task.group.assignedUsers.length > 0 + && this.task.group.assignedUsers.indexOf(this.user._id) === -1 + ) return true; + if (this.teamManagerAccess) return false; } return true; }, diff --git a/website/server/libs/tasks/index.js b/website/server/libs/tasks/index.js index 24473c44cb..e4503916cf 100644 --- a/website/server/libs/tasks/index.js +++ b/website/server/libs/tasks/index.js @@ -410,7 +410,7 @@ async function scoreTask (user, task, direction, req, res) { if (localTask) { localTask.completed = task.completed; - localTask.value = task.value + delta; + localTask.value = Number(task.value) + Number(delta); await localTask.save(); }