fix(condition): incomplete export

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

Hide file tree

Showing 4 changed files with 10 additions and 10 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();
@@ -163,6 +164,7 @@ public function export($remove_uuid = false) {
 
       $condition = $this->fields;
 
+      // remove key and FK
       unset($condition['items_id']);
 
       // remove ID or UUID
@@ -174,13 +176,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 = $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]);
 
@@ -239,7 +234,7 @@ public function showConditionsForItem($form, PluginFormcreatorConditionnableInte
       echo '<tr">';
       echo '<td colspan="4">';
       Dropdown::showFromArray(
-         'show_rule', 
+         'show_rule',
          $this->getEnumShowRule(),
          [
             'value'        => $item->fields['show_rule'],

diff --git a/inc/question.class.php b/inc/question.class.php
@@ -934,8 +934,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/questiondependency.class.php b/inc/questiondependency.class.php
@@ -136,6 +136,7 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          throw new ImportFailureException('UUID or ID is mandatory');
       }
 
+      // restore key and FK
       $questionFk = PluginFormcreatorQuestion::getForeignKeyField();
       $input[$questionFk] = $containerId;
 

diff --git a/inc/section.class.php b/inc/section.class.php
@@ -35,7 +35,7 @@
    die("Sorry. You can't access this file directly");
 }
 
-class PluginFormcreatorSection extends CommonDBChild implements 
+class PluginFormcreatorSection extends CommonDBChild implements
 PluginFormcreatorExportableInterface,
 PluginFormcreatorDuplicatableInterface,
 PluginFormcreatorConditionnableInterface
@@ -219,8 +219,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();
@@ -366,7 +368,7 @@ public function showForm($ID, $options = []) {
       }
       echo '<form name="plugin_formcreator_form" method="post" action="'.static::getFormURL().'">';
       echo '<table class="tab_cadre_fixe">';
-     
+
       echo '<tr>';
       echo '<th colspan="4">';
       echo $title;