fix(condition): fail to import conditions

Author: btry

inc/abstracttarget.class.php

@@ -139,16 +139,18 @@ public function prepareInputForAdd($input) {
          return false;
       }
 
+      if (!$this->skipChecks) {
+         if (!$this->checkConditionSettings($input)) {
+            $input['show_rule'] = PluginFormcreatorCondition::SHOW_RULE_ALWAYS;
+         }
+      }
+
       // generate a unique id
       if (!isset($input['uuid'])
          || empty($input['uuid'])) {
          $input['uuid'] = plugin_formcreator_getUuid();
       }
 
-      if (!$this->checkConditionSettings($input)) {
-         $input['show_rule'] = PluginFormcreatorCondition::SHOW_RULE_ALWAYS;
-      }
-
       return $input;
    }
 
@@ -160,6 +162,10 @@ public function prepareInputForUpdate($input) {
             Session::addMessageAfterRedirect(__('The name cannot be empty!', 'formcreator'), false, ERROR);
             return [];
          }
+
+         if (!$this->checkConditionSettings($input)) {
+            $input['show_rule'] = PluginFormcreatorCondition::SHOW_RULE_ALWAYS;
+         }
       }
 
       // generate a uniq id
@@ -168,10 +174,6 @@ public function prepareInputForUpdate($input) {
          $input['uuid'] = plugin_formcreator_getUuid();
       }
 
-      if (!$this->checkConditionSettings($input)) {
-         $input['show_rule'] = PluginFormcreatorCondition::SHOW_RULE_ALWAYS;
-      }
-
       return $input;
    }
 

inc/exportabletrait.class.php

@@ -82,8 +82,9 @@ public function exportChildrenObjects(array $subItems, array $export, bool $remo
      * @param array $input
      * @return void
      */
-   public function importChildrenObjects(PluginFormcreatorExportableInterface $item, PluginFormcreatorLinker $linker, array $subItems, array $input) : void {
-      $itemId = $item->getID();
+   public function importChildrenObjects(PluginFormcreatorExportableInterface $parent, PluginFormcreatorLinker $linker, array $subItems, array $input) : void {
+      /** @var CommonDBTM $parent */
+      $itemId = $parent->getID();
       foreach ($subItems as $key => $itemtypes) {
          if (!is_array($itemtypes)) {
             if (!isset($input[$key])) {
@@ -111,7 +112,7 @@ public function importChildrenObjects(PluginFormcreatorExportableInterface $item
             }
             // Delete all other restrictions
             $subItem = new $itemtype();
-            $subItem->deleteObsoleteItems($item, $importedItems);
+            $subItem->deleteObsoleteItems($parent, $importedItems);
          }
       }
    }

inc/question.class.php

@@ -399,6 +399,10 @@ private function checkBeforeSave($input) : array {
    public function prepareInputForAdd($input) {
       if (!$this->skipChecks) {
          $input = $this->checkBeforeSave($input);
+
+         if (!$this->checkConditionSettings($input)) {
+            $input['show_rule'] = PluginFormcreatorCondition::SHOW_RULE_ALWAYS;
+         }
       }
       if (count($input) === 0) {
          return [];
@@ -456,10 +460,6 @@ public function prepareInputForAdd($input) {
          $input['uuid'] = plugin_formcreator_getUuid();
       }
 
-      if (!$this->checkConditionSettings($input)) {
-         $input['show_rule'] = PluginFormcreatorCondition::SHOW_RULE_ALWAYS;
-      }
-
       return $input;
    }
 
@@ -478,7 +478,12 @@ public function prepareInputForUpdate($input) {
          if (!isset($input['plugin_formcreator_sections_id'])) {
             $input['plugin_formcreator_sections_id'] = $this->fields['plugin_formcreator_sections_id'];
          }
+
          $input = $this->checkBeforeSave($input);
+
+         if (!$this->checkConditionSettings($input)) {
+            $input['show_rule'] = PluginFormcreatorCondition::SHOW_RULE_ALWAYS;
+         }
       }
 
       if (!is_array($input) || count($input) == 0) {
@@ -510,10 +515,6 @@ public function prepareInputForUpdate($input) {
          }
       }
 
-      if (!$this->checkConditionSettings($input)) {
-         $input['show_rule'] = PluginFormcreatorCondition::SHOW_RULE_ALWAYS;
-      }
-
       return $input;
    }