From 4e9700069a25a85853599247a4124d65de1149d6 Mon Sep 17 00:00:00 2001 From: romankko2 Date: Thu, 22 Feb 2024 18:46:38 +0100 Subject: [PATCH] [subtask] fileUpload - Update --- app/src/plugins/tm@modal/master-task/z-master-task-modal.vue | 2 +- app/src/plugins/tm@modal/task/z-task-modal.vue | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue index ff75880..c309455 100644 --- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue +++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue @@ -319,7 +319,7 @@ export default { try { this.isSaving = true this.mastertask.deadline = moment(this.mastertask.deadline).format('YYYY-MM-DD HH:MM:SS') - if (this.mastertask.id) await this.$axios.put_auth_data(`v1/mastertasks/${this.mastertask.id}`, this.mastertask) + if (this.mastertask.id) await this.$axios.patch_auth_form(`v1/mastertasks/${this.mastertask.id}`, this.mastertask) else await this.$axios.post_auth_data('v1/mastertasks', this.mastertask) this.$emit('master-task-edited', this.mastertask) diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue index 9a1ca39..d505277 100644 --- a/app/src/plugins/tm@modal/task/z-task-modal.vue +++ b/app/src/plugins/tm@modal/task/z-task-modal.vue @@ -319,8 +319,7 @@ export default { return timesheet }) - // const { subtask } = await this.$axios.patch_auth_form(`v1/subtasks/${this.subtask.id}`, { ...this.subtask, timesheets }) - const { subtask } = await this.$axios.put_auth(`v1/subtasks/${this.subtask.id}`, { ...this.subtask, timesheets }) + const { subtask } = await this.$axios.patch_auth_form(`v1/subtasks/${this.subtask.id}`, { ...this.subtask, timesheets }) this.$store.commit('tm/update_subtask', subtask) this.$events.emit('on-subtask-edited', this.subtask) @@ -329,7 +328,7 @@ export default { if (employee.id) employee.timeblocks = this.timeblocks.filter(timeblock => timeblock.date).map(timeblock => { return { start: `${moment(timeblock.date).format('YYYY-MM-DD')} ${timeblock.starts_at_time}:00`, end: `${moment(timeblock.date).format('YYYY-MM-DD')} ${timeblock.ends_at_time}:00`, id: null } }) }) - const subtaskCopy = JSON.parse(JSON.stringify(this.subtask)) + const subtaskCopy = this.subtask delete subtaskCopy._master_task const { subtasks } = await this.$axios.post_auth(`v1/mastertasks/${this.subtask.master_task_id}/subtasks`, subtaskCopy) this.subtask.id = subtasks[0].id