From 988675a7a7819ce81731aeda817e66cfc690ba9e Mon Sep 17 00:00:00 2001 From: Alireza Ahmadi Date: Thu, 23 May 2024 11:57:51 +0200 Subject: [PATCH] fix editing in/out tag --- frontend/src/views/Inbounds.vue | 4 +++- frontend/src/views/Outbounds.vue | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Inbounds.vue b/frontend/src/views/Inbounds.vue index cc2e73c..c9aff94 100644 --- a/frontend/src/views/Inbounds.vue +++ b/frontend/src/views/Inbounds.vue @@ -158,7 +158,9 @@ const closeModal = () => { modal.value.visible = false } const saveModal = (data:Inbound, stats: boolean) => { - if (inbounds.value.findIndex(c => c.tag == data.tag) != modal.value.id) { + // Check duplicate tag + const oldTag = modal.value.id != -1 ? inbounds.value[modal.value.id].tag : null + if (data.tag != oldTag && inTags.value.includes(data.tag)) { const sb = Message() sb.showMessage(i18n.global.t('error.dplData') + ': ' + i18n.global.t('objects.tag') ,'error', 5000) return diff --git a/frontend/src/views/Outbounds.vue b/frontend/src/views/Outbounds.vue index 7242111..2472c04 100644 --- a/frontend/src/views/Outbounds.vue +++ b/frontend/src/views/Outbounds.vue @@ -139,7 +139,9 @@ const closeModal = () => { modal.value.visible = false } const saveModal = (data:Outbound, stats: boolean) => { - if (outbounds.value.findIndex(c => c.tag == data.tag) != modal.value.id) { + // Check duplicate tag + const oldTag = modal.value.id != -1 ? outbounds.value[modal.value.id].tag : null + if (data.tag != oldTag && outboundTags.value.includes(data.tag)) { const sb = Message() sb.showMessage(i18n.global.t('error.dplData') + ': ' + i18n.global.t('objects.tag') ,'error', 5000) return