fix(targettichet,targetchange): question tags not updated on duplication

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jun 10, 2020 · 22f765d · 22f765d
1 parent 47cf0c9
commit 22f765d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/inc/targetchange.class.php b/inc/targetchange.class.php
@@ -87,7 +87,7 @@ protected function getCategoryFilter() {
 
    protected function getTaggableFields() {
       return [
-         'name',
+         'target_name',
          'content',
          'impactcontent',
          'controlistcontent',
@@ -166,18 +166,13 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
       // convert question uuid into id
       $questions = $linker->getObjectsByType(PluginFormcreatorQuestion::class);
       if ($questions !== false) {
-         $questionIdentifier = 'id';
-         if (isset($input['uuid'])) {
-            $questionIdentifier = 'uuid';
-         }
          $taggableFields = $item->getTaggableFields();
-         foreach ($questions as $question) {
-            $id         = $question['id'];
-            $originalId = $question[$questionIdentifier];
+         foreach ($questions as $originalId => $question) {
+            $newId = $question->getID();
             foreach ($taggableFields as $field) {
                $content = $input[$field];
-               $content = str_replace("##question_$originalId##", "##question_$id##", $content);
-               $content = str_replace("##answer_$originalId##", "##answer_$id##", $content);
+               $content = str_replace("##question_$originalId##", "##question_$newId##", $content);
+               $content = str_replace("##answer_$originalId##", "##answer_$newId##", $content);
                $input[$field] = $content;
             }
          }

diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
@@ -1061,18 +1061,13 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
       // convert question uuid into id
       $questions = $linker->getObjectsByType(PluginFormcreatorQuestion::class);
       if ($questions !== false) {
-         $questionIdentifier = 'id';
-         if (isset($input['uuid'])) {
-            $questionIdentifier = 'uuid';
-         }
          $taggableFields = $item->getTaggableFields();
-         foreach ($questions as $question) {
-            $id         = $question->getID();
-            $originalId = $question->fields[$questionIdentifier];
+         foreach ($questions as $originalId => $question) {
+            $newId = $question->getID();
             foreach ($taggableFields as $field) {
                $content = $input[$field];
-               $content = str_replace("##question_$originalId##", "##question_$id##", $content);
-               $content = str_replace("##answer_$originalId##", "##answer_$id##", $content);
+               $content = str_replace("##question_$originalId##", "##question_$newId##", $content);
+               $content = str_replace("##answer_$originalId##", "##answer_$newId##", $content);
                $input[$field] = $content;
             }
          }
@@ -1112,7 +1107,7 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
 
    protected function getTaggableFields() {
       return [
-         'name',
+         'target_name',
          'content',
       ];
    }

diff --git a/tests/suite-unit/PluginFormcreatorTargetChange.php b/tests/suite-unit/PluginFormcreatorTargetChange.php
@@ -206,7 +206,7 @@ public function testGetTaggableFields() {
       $instance = new PluginFormcreatorTargetChangeDummy();
       $output = $instance->publicGetTaggableFields();
       $this->array($output)->isEqualTo([
-         'name',
+         'target_name',
          'content',
          'impactcontent',
          'controlistcontent',

diff --git a/tests/suite-unit/PluginFormcreatorTargetTicket.php b/tests/suite-unit/PluginFormcreatorTargetTicket.php
@@ -270,7 +270,7 @@ public function testGetTaggableFields() {
       $instance = new PluginFormcreatorTargetTicketDummy();
       $output = $instance->publicGetTaggableFields();
       $this->array($output)->isEqualTo([
-         'name',
+         'target_name',
          'content',
       ]);
    }