fix(target): distinguish fields content

pluginsGLPI · Mar 5, 2018 · 326315c · 326315c
1 parent b10134e
commit 326315c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/front/targetticket.form.php b/front/targetticket.form.php
@@ -45,10 +45,6 @@
 
 // Edit an existing target ticket
 if (isset($_POST["update"])) {
-   $target = new PluginFormcreatorTarget();
-   $found  = $target->find('items_id = ' . (int) $_POST['id']);
-   $found  = array_shift($found);
-   $target->update(['id' => $found['id'], 'name' => $_POST['name']]);
    $targetticket->update($_POST);
    Html::back();
 

diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
@@ -924,6 +924,13 @@ public function prepareInputForUpdate($input) {
          $input['uuid'] = plugin_formcreator_getUuid();
       }
 
+      $target = new PluginFormcreatorTarget();
+      $found  = $target->find('items_id = ' . $this->getID());
+      $found  = array_shift($found);
+      $target->update(['id' => $found['id'], 'name' => $input['name']]);
+      $input['name'] = $input['title'];
+      unset($input['title']);
+
       return $input;
    }
 
@@ -1469,7 +1476,7 @@ public static function import($targetitems_id = 0, $target_data = []) {
          foreach ($rows as $id => $question_line) {
             $uuid  = $question_line['uuid'];
 
-            $content = $target_data['name'];
+            $content = $target_data['title'];
             $content = str_replace("##question_$uuid##", "##question_$id##", $content);
             $content = str_replace("##answer_$uuid##", "##answer_$id##", $content);
             $target_data['name'] = $content;
@@ -1561,6 +1568,8 @@ public function export() {
       unset($target_data['id'],
             $target_data['tickettemplates_id']);
 
+      $target_data['title'] = $target_data['name'];
+      unset($target_data['name']);
       return $target_data;
    }
 }
diff --git a/tests/0010_Integration/ExportImportTest.php b/tests/0010_Integration/ExportImportTest.php
@@ -282,7 +282,7 @@ public function _checkTarget($target = []) {
    public function _checkTargetTicket($targetticket = []) {
       $this->assertArrayNotHasKey('id', $targetticket);
       $this->assertArrayNotHasKey('tickettemplates_id', $targetticket);
-      $this->assertArrayHasKey('name', $targetticket);
+      $this->assertArrayHasKey('title', $targetticket);
       $this->assertArrayHasKey('comment', $targetticket);
       $this->assertArrayHasKey('due_date_rule', $targetticket);
       $this->assertArrayHasKey('due_date_question', $targetticket);