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

btry · btry · commit 8dfab2432145 · 2020-01-09T16:16:03.000+01:00
Signed-off-by: Thierry Bugier &lt;tbugier@teclib.com&gt;
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

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con`
`136`	`136`	`$itemId = $item->add($input);`
`137`	`137`	`}`
`138`	`138`	`if ($itemId === false) {`
`139`		`- throw new ImportFailureException('failed to add or update the item');`
	`139`	`+ $typeName = strtolower(self::getTypeName());`
	`140`	`+ throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));`
`140`	`141`	`}`
`141`	`142`
`142`	`143`	`// add the question to the linker`
Original file line number	Diff line number	Diff line change
`@@ -1866,22 +1866,27 @@ public function importJson($params = []) {`
`1866`	`1866`	`continue;`
`1867`	`1867`	`}`
`1868`	`1868`
	`1869`	`+ $success = true;`
`1869`	`1870`	`foreach ($forms_toimport['forms'] as $form) {`
`1870`	`1871`	`set_time_limit(30);`
`1871`	`1872`	`$linker = new PluginFormcreatorLinker();`
`1872`	`1873`	`try {`
`1873`	`1874`	`self::import($linker, $form);`
`1874`	`1875`	`} catch (ImportFailureException $e) {`
`1875`	`1876`	`// Import failed, give up`
	`1877`	`+ $sucess = false;`
	`1878`	`+ Session::addMessageAfterRedirect($e->getMessage(), false, ERROR);`
`1876`	`1879`	`continue;`
`1877`	`1880`	`}`
`1878`	`1881`	`if (!$linker->linkPostponed()) {`
`1879`	`1882`	`Session::addMessageAfterRedirect(sprintf(__("Failed to import %s", "formcreator"),`
`1880`	`1883`	`$$form['name']));`
`1881`	`1884`	`}`
`1882`	`1885`	`}`
`1883`		`- Session::addMessageAfterRedirect(sprintf(__("Forms successfully imported from %s", "formcreator"),`
	`1886`	`+ if ($sucess) {`
	`1887`	`+ Session::addMessageAfterRedirect(sprintf(__("Forms successfully imported from %s", "formcreator"),`
`1884`	`1888`	`$filename));`
	`1889`	`+ }`
`1885`	`1890`	`}`
`1886`	`1891`	`}`
`1887`	`1892`
`@@ -1969,7 +1974,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con`
`1969`	`1974`	`$itemId = $item->add($input);`
`1970`	`1975`	`}`
`1971`	`1976`	`if ($itemId === false) {`
`1972`		`- throw new ImportFailureException('failed to add or update the item');`
	`1977`	`+ $typeName = strtolower(self::getTypeName());`
	`1978`	`+ throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));`
`1973`	`1979`	`}`
`1974`	`1980`
`1975`	`1981`	`// add the form to the linker`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con`
`203`	`203`	`$itemId = $item->add($input);`
`204`	`204`	`}`
`205`	`205`	`if ($itemId === false) {`
`206`		`- throw new ImportFailureException('failed to add or update the item');`
	`206`	`+ $typeName = strtolower(self::getTypeName());`
	`207`	`+ throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));`
`207`	`208`	`}`
`208`	`209`
`209`	`210`	`// add the form_profile to the linker`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $for`
`105`	`105`	`$itemId = $item->add($input);`
`106`	`106`	`}`
`107`	`107`	`if ($itemId === false) {`
`108`		`- throw new ImportFailureException();`
	`108`	`+ $typeName = strtolower(self::getTypeName());`
	`109`	`+ throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`// add the item to the linker`
Original file line number	Diff line number	Diff line change
`@@ -971,7 +971,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con`
`971`	`971`	`$itemId = $item->add($input);`
`972`	`972`	`}`
`973`	`973`	`if ($itemId === false) {`
`974`		`- throw new ImportFailureException('failed to add or update the item');`
	`974`	`+ $typeName = strtolower(self::getTypeName());`
	`975`	`+ throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));`
`975`	`976`	`}`
`976`	`977`
`977`	`978`	`// add the question to the linker`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con`
`186`	`186`	`$itemId = $item->add($input);`
`187`	`187`	`}`
`188`	`188`	`if ($itemId === false) {`
`189`		`- throw new ImportFailureException('failed to add or update the item');`
	`189`	`+ $typeName = strtolower(self::getTypeName());`
	`190`	`+ throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));`
`190`	`191`	`}`
`191`	`192`
`192`	`193`	`// add the parameter to the linker`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con`
`170`	`170`	`$itemId = $item->add($input);`
`171`	`171`	`}`
`172`	`172`	`if ($itemId === false) {`
`173`		`- throw new ImportFailureException('failed to add or update the item');`
	`173`	`+ $typeName = strtolower(self::getTypeName());`
	`174`	`+ throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));`
`174`	`175`	`}`
`175`	`176`
`176`	`177`	`// add the question to the linker`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con`
`165`	`165`	`$itemId = $item->add($input);`
`166`	`166`	`}`
`167`	`167`	`if ($itemId === false) {`
`168`		`- throw new ImportFailureException('failed to add or update the item');`
	`168`	`+ $typeName = strtolower(self::getTypeName());`
	`169`	`+ throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));`
`169`	`170`	`}`
`170`	`171`
`171`	`172`	`// add the question to the linker`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con`
`253`	`253`	`$itemId = $item->add($input);`
`254`	`254`	`}`
`255`	`255`	`if ($itemId === false) {`
`256`		`- throw new ImportFailureException('failed to add or update the item');`
	`256`	`+ $typeName = strtolower(self::getTypeName());`
	`257`	`+ throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));`
`257`	`258`	`}`
`258`	`259`
`259`	`260`	`// add the section to the linker`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,8 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con`
`156`	`156`	`$itemId = $item->add($input);`
`157`	`157`	`}`
`158`	`158`	`if ($itemId === false) {`
`159`		`- throw new ImportFailureException('failed to add or update the item');`
	`159`	`+ $typeName = strtolower(self::getTypeName());`
	`160`	`+ throw new ImportFailureException(sprintf(__('failed to add or update the %1$s %2$s', 'formceator'), $typeName, $input['name']));`
`160`	`161`	`}`
`161`	`162`
`162`	`163`	`// add the question to the linker`