krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(tasks): manager lock icon, coerce task value to Number

Browse Source
This commit is contained in:
Sabe Jones
2021-05-19 14:44:08 -05:00
committed by SabreCat
parent 072b09e030
commit 801b902bb8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
},

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

@@ -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();
}