From 75971adf82d5b22ea3db9784a6e14d534b1d159e Mon Sep 17 00:00:00 2001
From: Rom1-B <rbiot@teclib.com>
Date: Mon, 21 Aug 2023 15:48:20 +0200
Subject: [PATCH] fix(tag): tag was always deleted

---
 inc/targetchange.class.php  | 4 ++--
 inc/targetproblem.class.php | 4 ++--
 inc/targetticket.class.php  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/inc/targetchange.class.php b/inc/targetchange.class.php
index c18797f3c..1f8facab4 100644
--- a/inc/targetchange.class.php
+++ b/inc/targetchange.class.php
@@ -712,8 +712,6 @@ public function save(PluginFormcreatorFormAnswer $formanswer): ?CommonDBTM {
          return null;
       }
 
-      $this->saveTags($formanswer, $changeID);
-
       // Add link between Change and FormAnswer
       $itemlink = $this->getItem_Item();
       $itemlink->add([
@@ -722,6 +720,8 @@ public function save(PluginFormcreatorFormAnswer $formanswer): ?CommonDBTM {
          'changes_id'  => $changeID,
       ]);
 
+      $this->saveTags($formanswer, $changeID);
+
       return $change;
    }
 
diff --git a/inc/targetproblem.class.php b/inc/targetproblem.class.php
index 61cc0707f..3e911a9e3 100644
--- a/inc/targetproblem.class.php
+++ b/inc/targetproblem.class.php
@@ -232,8 +232,6 @@ public function save(PluginFormcreatorFormAnswer $formanswer): ?CommonDBTM {
          return null;
       }
 
-      $this->saveTags($formanswer, $problemID);
-
       // Add link between Problem and FormAnswer
       $itemlink = $this->getItem_Item();
       $itemlink->add([
@@ -242,6 +240,8 @@ public function save(PluginFormcreatorFormAnswer $formanswer): ?CommonDBTM {
          'problems_id'  => $problemID,
       ]);
 
+      $this->saveTags($formanswer, $problemID);
+
       return $problem;
    }
 
diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
index 8620abaec..fd2d92b35 100644
--- a/inc/targetticket.class.php
+++ b/inc/targetticket.class.php
@@ -922,8 +922,6 @@ public function save(PluginFormcreatorFormAnswer $formanswer): ?CommonDBTM {
          }
       }
 
-      $this->saveTags($formanswer, $ticketID);
-
       // Add link between Ticket and FormAnswer
       $itemlink = $this->getItem_Item();
       $itemlink->add([
@@ -932,6 +930,8 @@ public function save(PluginFormcreatorFormAnswer $formanswer): ?CommonDBTM {
          'tickets_id' => $ticketID,
       ]);
 
+      $this->saveTags($formanswer, $ticketID);
+
       // Attach validation message as first ticket followup if validation is required and
       // if is set in ticket target configuration
       if ($form->validationRequired() && $this->fields['validation_followup']) {