fix(form,question): duplicate fail on form without section

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jan 31, 2020 · 4db8455 · 4db8455
1 parent 3a6968f
commit 4db8455
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/inc/form.class.php b/inc/form.class.php
@@ -1986,11 +1986,15 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
             }
             $importedItems[] = $importedItem;
          }
-         // Delete all other restrictions
+         // Delete all other sections
+         $deleteCriteria = [];
+         if (count($importedItems) > 0) {
+            $deleteCriteria = ['NOT' => ['id' => $importedItems]];
+         }
          $FormProfile = new PluginFormcreatorSection();
          $FormProfile->deleteByCriteria([
             $formFk => $itemId,
-            ['NOT' => ['id' => $importedItems]]
+            $deleteCriteria,
          ]);
       }
 

diff --git a/inc/section.class.php b/inc/section.class.php
@@ -262,7 +262,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
       // add the section to the linker
       $linker->addObject($originalId, $item);
 
-      // Import the questions
+      // Import each question
+      $importedItems = [];
       if (isset($input['_questions'])) {
          // sort questions by order
          usort($input['_questions'], function ($a, $b) {
@@ -273,9 +274,24 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          });
 
          foreach ($input['_questions'] as $question) {
-            PluginFormcreatorQuestion::import($linker, $question, $itemId);
+            $importedItem = PluginFormcreatorQuestion::import($linker, $question, $itemId);
+            if ($importedItem === false) {
+               // Falied to import a question
+               return false;
+            }
+            $importedItems[] = $importedItem;
          }
       }
+      // Delete all other questions
+      $deleteCriteria = [];
+      if (count($importedItems) > 0) {
+         $deleteCriteria = ['NOT' => ['id' => $importedItems]];
+      }
+      $FormProfile = new PluginFormcreatorSection();
+      $FormProfile->deleteByCriteria([
+         $formFk => $itemId,
+         $deleteCriteria,
+      ]);
 
       // Import conditions
       if (isset($input['_conditions'])) {