fix(targetticket): undefined type after creation

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Sep 25, 2020 · e3188ef · e3188ef
1 parent 8a26b77
commit e3188ef
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 2 deletions.
diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
@@ -355,7 +355,17 @@ protected function showCompositeTicketSettings($rand) {
 
    public function prepareInputForAdd($input) {
       $input = parent::prepareInputForAdd($input);
-
+      if ($input === false) {
+         return false;
+      }
+      if (!isset($input['type_rule'])) {
+         $input['type_rule'] = self::REQUESTTYPE_SPECIFIC;
+      }
+      if ($input['type_rule'] == self::REQUESTTYPE_SPECIFIC) {
+         if (!isset($input['type_question']) || !in_array($input['type_question'], [Ticket::INCIDENT_TYPE, Ticket::DEMAND_TYPE])) {
+            $input['type_question'] = Ticket::INCIDENT_TYPE;
+         }
+      }
       return $input;
    }
 

diff --git a/tests/suite-unit/PluginFormcreatorTargetTicket.php b/tests/suite-unit/PluginFormcreatorTargetTicket.php
@@ -1113,7 +1113,7 @@ public function testIsEntityAssign() {
       $this->boolean($instance->isEntityAssign())->isFalse();
    }
 
-   public function testdeleteObsoleteItems() {
+   public function testDeleteObsoleteItems() {
       $form = $this->getForm();
       $targetTicket1 = $this->getTargetTicket([
          'plugin_formcreator_forms_id' => $form->getID(),
@@ -1129,4 +1129,54 @@ public function testdeleteObsoleteItems() {
       $checkDeleted = $this->newTestedInstance();
       $this->boolean($checkDeleted->getFromDB($targetTicket2->getID()))->isTrue();
    }
+
+   public function providerPrepareInputForAdd() {
+      $formFk = \PluginFormcreatorForm::getForeignKeyField();
+      $form = $this->getForm();
+      $name = $this->getUniqueString();
+      return [
+         [
+            'input'    => [
+               $formFk => $form->getID(),
+               'name' => $name,
+            ],
+            'expected' => [
+               $formFk => $form->getID(),
+               'name' => $name,
+               'target_name' => $name,
+               'content' => '##FULLFORM##',
+               'type_rule'     => \PluginFormcreatorTargetTicket::REQUESTTYPE_SPECIFIC,
+               'type_question' => \Ticket::INCIDENT_TYPE
+            ],
+         ],
+         [
+            'input'    => [
+               $formFk => $form->getID(),
+               'name' => $name,
+               'type_rule'     => \PluginFormcreatorTargetTicket::REQUESTTYPE_SPECIFIC,
+               'type_question' => \Ticket::DEMAND_TYPE
+            ],
+            'expected' => [
+               $formFk => $form->getID(),
+               'name' => $name,
+               'target_name' => $name,
+               'content' => '##FULLFORM##',
+               'type_rule'     => \PluginFormcreatorTargetTicket::REQUESTTYPE_SPECIFIC,
+               'type_question' => \Ticket::DEMAND_TYPE
+            ],
+         ],
+      ];
+   }
+
+   /**
+    * @dataProvider providerPrepareInputForAdd
+    *
+    */
+   public function testPrepareInputForAdd($input, $expected) {
+      $instance = $this->newTestedInstance();
+      $output = $instance->prepareInputForAdd($input);
+      $this->array($output)->hasKey('uuid');
+      unset($output['uuid']);
+      $this->array($output)->isEqualTo($expected);
+   }
 }