fix(form): show error if failure in import of a sub item

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jan 9, 2020 · 8dfab24 · 8dfab24
1 parent 812c76d
commit 8dfab24
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 13 deletions.
diff --git a/inc/condition.class.php b/inc/condition.class.php
@@ -136,7 +136,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          $itemId = $item->add($input);
       }
       if ($itemId === false) {
-         throw new ImportFailureException('failed to add or update the item');
+         $typeName = strtolower(self::getTypeName());
+         throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));
       }
 
       // add the question to the linker

diff --git a/inc/form.class.php b/inc/form.class.php
@@ -1866,22 +1866,27 @@ public function importJson($params = []) {
             continue;
          }
 
+         $success = true;
          foreach ($forms_toimport['forms'] as $form) {
             set_time_limit(30);
             $linker = new PluginFormcreatorLinker();
             try {
                self::import($linker, $form);
             } catch (ImportFailureException $e) {
                // Import failed, give up
+               $sucess = false;
+               Session::addMessageAfterRedirect($e->getMessage(), false, ERROR);
                continue;
             }
             if (!$linker->linkPostponed()) {
                Session::addMessageAfterRedirect(sprintf(__("Failed to import %s", "formcreator"),
                                                            $$form['name']));
             }
          }
-         Session::addMessageAfterRedirect(sprintf(__("Forms successfully imported from %s", "formcreator"),
+         if ($sucess) {
+            Session::addMessageAfterRedirect(sprintf(__("Forms successfully imported from %s", "formcreator"),
                                                       $filename));
+         }
       }
    }
 
@@ -1969,7 +1974,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          $itemId = $item->add($input);
       }
       if ($itemId === false) {
-         throw new ImportFailureException('failed to add or update the item');
+         $typeName = strtolower(self::getTypeName());
+         throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));
       }
 
       // add the form to the linker

diff --git a/inc/form_profile.class.php b/inc/form_profile.class.php
@@ -203,7 +203,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          $itemId = $item->add($input);
       }
       if ($itemId === false) {
-         throw new ImportFailureException('failed to add or update the item');
+         $typeName = strtolower(self::getTypeName());
+         throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));
       }
 
       // add the form_profile to the linker

diff --git a/inc/form_validator.class.php b/inc/form_validator.class.php
@@ -105,7 +105,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $for
          $itemId = $item->add($input);
       }
       if ($itemId === false) {
-         throw new ImportFailureException();
+         $typeName = strtolower(self::getTypeName());
+         throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));
       }
 
       // add the item to the linker

diff --git a/inc/question.class.php b/inc/question.class.php
@@ -971,7 +971,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          $itemId = $item->add($input);
       }
       if ($itemId === false) {
-         throw new ImportFailureException('failed to add or update the item');
+         $typeName = strtolower(self::getTypeName());
+         throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));
       }
 
       // add the question to the linker

diff --git a/inc/questiondependency.class.php b/inc/questiondependency.class.php
@@ -186,7 +186,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          $itemId = $item->add($input);
       }
       if ($itemId === false) {
-         throw new ImportFailureException('failed to add or update the item');
+         $typeName = strtolower(self::getTypeName());
+         throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));
       }
 
       // add the parameter to the linker

diff --git a/inc/questionrange.class.php b/inc/questionrange.class.php
@@ -170,7 +170,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          $itemId = $item->add($input);
       }
       if ($itemId === false) {
-         throw new ImportFailureException('failed to add or update the item');
+         $typeName = strtolower(self::getTypeName());
+         throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));
       }
 
       // add the question to the linker

diff --git a/inc/questionregex.class.php b/inc/questionregex.class.php
@@ -165,7 +165,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          $itemId = $item->add($input);
       }
       if ($itemId === false) {
-         throw new ImportFailureException('failed to add or update the item');
+         $typeName = strtolower(self::getTypeName());
+         throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));
       }
 
       // add the question to the linker

diff --git a/inc/section.class.php b/inc/section.class.php
@@ -253,7 +253,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          $itemId = $item->add($input);
       }
       if ($itemId === false) {
-         throw new ImportFailureException('failed to add or update the item');
+         $typeName = strtolower(self::getTypeName());
+         throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));
       }
 
       // add the section to the linker

diff --git a/inc/target_actor.class.php b/inc/target_actor.class.php
@@ -156,7 +156,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          $itemId = $item->add($input);
       }
       if ($itemId === false) {
-         throw new ImportFailureException('failed to add or update the item');
+         $typeName = strtolower(self::getTypeName());
+         throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));
       }
 
       // add the question to the linker

diff --git a/inc/targetchange.class.php b/inc/targetchange.class.php
@@ -208,7 +208,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          $itemId = $item->add($input);
       }
       if ($itemId === false) {
-         throw new ImportFailureException('failed to add or update the item');
+         $typeName = strtolower(self::getTypeName());
+         throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));
       }
 
       // add the target to the linker

diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
@@ -931,7 +931,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
          $itemId = $item->add($input);
       }
       if ($itemId === false) {
-         throw new ImportFailureException('failed to add or update the item');
+         $typeName = strtolower(self::getTypeName());
+         throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));
       }
 
       // add the target to the linker