diff --git a/app/src/plugins/app/_config/App.vue b/app/src/plugins/app/_config/App.vue index 3264442..8fd52b2 100644 --- a/app/src/plugins/app/_config/App.vue +++ b/app/src/plugins/app/_config/App.vue @@ -10,7 +10,7 @@ - + @@ -114,7 +114,7 @@ export default { }, onMasterTaskDeleted(mastertask){ - this.$events.emit('on-master-task-deleted', mastertask) + this.$events.emit('on-mastertask-deleted', mastertask) }, onMasterTaskEdited(mastertask){ diff --git a/app/src/plugins/tm@dashboard/projects/projects.vue b/app/src/plugins/tm@dashboard/projects/projects.vue index c762b58..fd8c4ea 100644 --- a/app/src/plugins/tm@dashboard/projects/projects.vue +++ b/app/src/plugins/tm@dashboard/projects/projects.vue @@ -46,6 +46,16 @@ export default { } }, + mounted() { + this.$events.on('on-mastertask-edited', () => this.onFilterChanged(this.filter)) + this.$events.on('on-mastertask-deleted', () => this.onFilterChanged(this.filter)) + }, + + unmounted() { + this.$events.off('on-mastertask-edited') + this.$events.off('on-mastertask-deleted') + }, + methods: { async onFilterChanged(filter) { this.mastertasks = null diff --git a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts index 31170b2..ce31ef8 100644 --- a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts +++ b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts @@ -55,8 +55,8 @@ export default { }, watch: { - 'mastertask.team_id'(value, oldValue) { - if (!value || !oldValue) return + 'mastertask.team_id'(value) { + if (!value) return this.mastertask.team = this.teams.find(team => team.id == value) this.mastertask.employees = this.mastertask.team.employees diff --git a/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue index c85f3d8..f939e36 100644 --- a/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue +++ b/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue @@ -21,7 +21,7 @@