fix(condition): fix export

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Feb 5, 2020 · 7db999d · 7db999d
1 parent b380b79
commit 7db999d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/inc/condition.class.php b/inc/condition.class.php
@@ -94,6 +94,7 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          throw new ImportFailureException('UUID or ID is mandatory');
       }
 
+      // restore key and FK
       $input['items_id'] = $containerId;
 
       $item = new self();
@@ -174,14 +175,6 @@ 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 = $condition['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]);
 

diff --git a/inc/question.class.php b/inc/question.class.php
@@ -897,8 +897,10 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          throw new ImportFailureException('UUID or ID is mandatory');
       }
 
+      // restore key and FK
       $sectionFk = PluginFormcreatorSection::getForeignKeyField();
       $input[$sectionFk] = $containerId;
+
       $input['_skip_checks'] = true;
 
       $item = new self();

diff --git a/inc/section.class.php b/inc/section.class.php
@@ -221,8 +221,10 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          throw new ImportFailureException('UUID or ID is mandatory');
       }
 
+      // restore key and FK
       $formFk = PluginFormcreatorForm::getForeignKeyField();
       $input[$formFk]        = $containerId;
+
       $input['_skip_checks'] = true;
 
       $item = new self();

diff --git a/tests/suite-unit/PluginFormcreatorCondition.php b/tests/suite-unit/PluginFormcreatorCondition.php
@@ -175,7 +175,6 @@ public function testExport() {
       // Test the exported data
       $fieldsWithoutID = [
          'itemtype',
-         'items_id',
          'plugin_formcreator_questions_id',
          'show_condition',
          'show_value',