Group Plans quick wins (#11107)

* WIP(groups): quickish wins

* WIP(groups): two quick wins
1. Don't show task creation button if user is not leader or manager
2. Don't require JS confirm() for approving tasks

* fix(group-plans): allow delete from options button

* fix(group-plans): update tasksOrder when task deleted

* fix(group-tasks): dismiss notification when user takes action

* refactor(tasks): DRY out create button styling

* fix(group-tasks): sync after claiming/unclaiming
This commit is contained in:
Sabe Jones
2019-04-15 10:48:27 -05:00
committed by GitHub
parent 7a5a856ac6
commit 76ae41875d
13 changed files with 150 additions and 117 deletions

View File

@@ -4,6 +4,7 @@ base-notification(
:has-icon="false",
:notification="notification",
@click="action",
ref="taskApprovalNotification",
)
div(slot="content")
div(v-html="notification.data.message")
@@ -43,12 +44,12 @@ export default {
return;
}
if (!confirm(this.$t('confirmApproval'))) return;
this.$store.dispatch('tasks:approve', {
await this.$store.dispatch('tasks:approve', {
taskId: this.notification.data.groupTaskId,
userId: this.notification.data.userId,
});
this.$refs.taskApprovalNotification.remove();
},
async needsWork () {
// Redirect users to the group tasks page if the notification doesn't have data
@@ -62,11 +63,13 @@ export default {
if (!confirm(this.$t('confirmNeedsWork'))) return;
this.$store.dispatch('tasks:needsWork', {
await this.$store.dispatch('tasks:needsWork', {
taskId: this.notification.data.groupTaskId,
userId: this.notification.data.userId,
});
this.$refs.taskApprovalNotification.remove();
},
},
};
</script>
</script>