feat(teams): new disapproval workflow, managers can uncheck tasks
This commit is contained in:
@@ -222,6 +222,7 @@ export default {
|
||||
|
||||
this.$root.$on('habitica:team-sync', () => {
|
||||
this.loadTasks();
|
||||
this.loadGroupCompletedTodos();
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
|
||||
@@ -1046,9 +1046,13 @@ export default {
|
||||
showTaskLockIcon () {
|
||||
if (this.isUser) return false;
|
||||
if (this.isGroupTask) {
|
||||
if (this.isOpenTask) return false;
|
||||
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.teamManagerAccess && this.task.completed) return false;
|
||||
}
|
||||
return true;
|
||||
},
|
||||
|
||||
@@ -56,11 +56,15 @@ export default {
|
||||
const canScoreTask = await this.beforeTaskScore(task);
|
||||
if (!canScoreTask) return;
|
||||
|
||||
try {
|
||||
scoreTask({ task, user, direction });
|
||||
} catch (err) {
|
||||
this.text(err.message);
|
||||
return;
|
||||
if (direction === 'down' && task.group.completedBy && task.group.completedBy !== user._id) {
|
||||
task.completed = false;
|
||||
} else {
|
||||
try {
|
||||
scoreTask({ task, user, direction });
|
||||
} catch (err) {
|
||||
this.text(err.message);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
this.playTaskScoreSound(task, direction);
|
||||
|
||||
Reference in New Issue
Block a user