diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-19 21:08:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-19 21:08:48 +0300 |
commit | dc539af30068062bd6fc2f9c6b478d4a1feb8c23 (patch) | |
tree | 37dd61148284c624396ba01a94af3663f308561d /app/assets/javascripts/work_items/components/work_item_detail_modal.vue | |
parent | 30cd626f8c1028ba096e84349580e0772a34b1af (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/work_items/components/work_item_detail_modal.vue')
-rw-r--r-- | app/assets/javascripts/work_items/components/work_item_detail_modal.vue | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/app/assets/javascripts/work_items/components/work_item_detail_modal.vue b/app/assets/javascripts/work_items/components/work_item_detail_modal.vue index faea80a9de8..171ebd13c29 100644 --- a/app/assets/javascripts/work_items/components/work_item_detail_modal.vue +++ b/app/assets/javascripts/work_items/components/work_item_detail_modal.vue @@ -50,12 +50,16 @@ export default { return { error: undefined, updatedWorkItemId: null, + updatedWorkItemIid: null, }; }, computed: { displayedWorkItemId() { return this.updatedWorkItemId || this.workItemId; }, + displayedWorkItemIid() { + return this.updatedWorkItemIid || this.workItemIid; + }, }, methods: { deleteWorkItem() { @@ -122,6 +126,7 @@ export default { }, closeModal() { this.updatedWorkItemId = null; + this.updatedWorkItemIid = null; this.error = ''; this.$emit('close'); }, @@ -134,9 +139,10 @@ export default { show() { this.$refs.modal.show(); }, - updateModal($event, workItemId) { - this.updatedWorkItemId = workItemId; - this.$emit('update-modal', $event, workItemId); + updateModal($event, workItem) { + this.updatedWorkItemId = workItem.id; + this.updatedWorkItemIid = workItem.iid; + this.$emit('update-modal', $event, workItem); }, }, }; @@ -160,7 +166,7 @@ export default { is-modal :work-item-parent-id="issueGid" :work-item-id="displayedWorkItemId" - :work-item-iid="workItemIid" + :work-item-iid="displayedWorkItemIid" class="gl-p-5 gl-mt-n3 gl-reset-bg gl-isolate" @close="hide" @deleteWorkItem="deleteWorkItem" |