fix(condition): export broken

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jan 27, 2020 · 9b7a692 · 9b7a692
1 parent d3588da
commit 9b7a692
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/inc/condition.class.php b/inc/condition.class.php
@@ -174,15 +174,9 @@ public function export($remove_uuid = false) {
          $question = new PluginFormcreatorQuestion();
          $question->getFromDB($condition['plugin_formcreator_questions_id']);
          $condition['plugin_formcreator_questions_id'] = $question->fields['uuid'];
-         $containerType = $input['itemtype'];
-         if (!class_exists($containerType) || !is_subclass_of($containerType, PluginFormcreatorConditionnableInterface::class)) {
-            return false;
-         }
-         $container = new $containerType();
-         $container->getFromDB($condition['items_id']);
-         $condition['items_id'] = $container->fields['uuid'];
       }
       unset($condition[$idToRemove]);
+      unset($condition['itemtype']);
 
       return $condition;
    }

diff --git a/inc/conditionnable.class.php b/inc/conditionnable.class.php
@@ -59,6 +59,9 @@ public function updateConditions($input) {
          return false;
       }
 
+      $itemtype = $this->getType();
+      $itemId = $this->getID();
+
       // Delete all existing conditions for the question
       $condition = new PluginFormcreatorCondition();
       $condition->deleteByCriteria([

diff --git a/tests/suite-unit/PluginFormcreatorCondition.php b/tests/suite-unit/PluginFormcreatorCondition.php
@@ -142,20 +142,22 @@ public function testExport() {
          'plugin_formcreator_forms_id' => $form->getID(),
       ]);
       $question2->updateConditions([
-         'id' => $question2->getID(),
          'show_rule' => \PluginFormcreatorCondition::SHOW_RULE_HIDDEN,
-         'plugin_formcreator_questions_id' => [
-            $question1->getID(),
-         ],
-         'show_condition' =>[
-            \PluginFormcreatorCondition::SHOW_CONDITION_EQ,
-         ],
-         'show_value' => [
-            'foo',
-         ],
-         'show_logic' => [
-            \PluginFormcreatorCondition::SHOW_LOGIC_AND,
-         ]
+         '_conditions' => [
+            'id' => $question2->getID(),
+            'plugin_formcreator_questions_id' => [
+               $question1->getID(),
+            ],
+            'show_condition' =>[
+               \PluginFormcreatorCondition::SHOW_CONDITION_EQ,
+            ],
+            'show_value' => [
+               'foo',
+            ],
+            'show_logic' => [
+               \PluginFormcreatorCondition::SHOW_LOGIC_AND,
+            ]
+            ],
       ]);
       $instance = $this->getTargetTicket();
       $instance->getFromDB($instance->getID());
@@ -172,7 +174,6 @@ public function testExport() {
 
       // Test the exported data
       $fieldsWithoutID = [
-         'itemtype',
          'plugin_formcreator_questions_id',
          'show_condition',
          'show_value',

diff --git a/tests/suite-unit/PluginFormcreatorFields.php b/tests/suite-unit/PluginFormcreatorFields.php
@@ -267,7 +267,7 @@ public function testIsVisible($show_rule, $conditions, $answers, $expectedVisibi
          );
          $realAnswers[$questionPool[$id]->getID()]->deserializeValue($answer);
       }
-      $input = $conditions + [
+      $input = [
          'id'        => $question->getID(),
          'fieldtype' => 'text',
          'show_rule' => $show_rule,
@@ -282,7 +282,8 @@ public function testIsVisible($show_rule, $conditions, $answers, $expectedVisibi
                   'regex' => ''
                ]
             ]
-         ]
+         ],
+         '_conditions' => $conditions,
       ];
       $question->update($input);
       $question->updateConditions($input);