From 0188bc7bc39b44f523b67e9c20f23b0bc37e027c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 18 Feb 2025 18:26:01 +0100
Subject: [PATCH] fix: refs #6897 update onClick logic to correctly handle save
 and continue functionality in FormModelPopup

---
 src/components/FormModelPopup.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 10bf8aae2..672eeff7a 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -27,12 +27,12 @@ const formModelRef = ref(null);
 const closeButton = ref(null);
 const isSaveAndContinue = ref(false);
 const onDataSaved = (formData, requestResponse) => {
-    if (closeButton.value && isSaveAndContinue.value) closeButton.value.click();
+    if (closeButton.value && !isSaveAndContinue.value) closeButton.value.click();
     emit('onDataSaved', formData, requestResponse);
 };
 
-const onClick = async () => {
-    isSaveAndContinue.value = true;
+const onClick = async (saveAndContinue) => {
+    isSaveAndContinue.value = saveAndContinue;
     await formModelRef.value.save();
 };
 
@@ -83,7 +83,7 @@ defineExpose({
                     :flat="showSaveAndContinueBtn"
                     :label="t('globals.save')"
                     :title="t('globals.save')"
-                    @click="onClick"
+                    @click="onClick(false)"
                     color="primary"
                     class="q-ml-sm"
                     :disabled="isLoading"
@@ -101,7 +101,7 @@ defineExpose({
                     :loading="isLoading"
                     data-cy="FormModelPopup_isSaveAndContinue"
                     z-max
-                    @click="onClick"
+                    @click="onClick(true)"
                 />
             </div>
         </template>