fix(import): more explicit error message

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jun 12, 2020 · 8bb3c3d · 8bb3c3d
1 parent 475e190
commit 8bb3c3d
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 12 deletions.
diff --git a/inc/condition.class.php b/inc/condition.class.php
@@ -58,6 +58,11 @@ class PluginFormcreatorCondition extends CommonDBChild implements PluginFormcrea
    const SHOW_CONDITION_QUESTION_VISIBLE = 7;
    const SHOW_CONDITION_QUESTION_INVISIBLE = 8;
 
+   public static function getTypeName($nb = 0) {
+      return _n('Condition', 'Conditions', $nb, 'formcreator');
+   }
+
+
    public function prepareInputForAdd($input) {
       // generate a unique id
       if (!isset($input['uuid'])
@@ -100,7 +105,7 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
       global $DB;
 
       if (!isset($input['uuid']) && !isset($input['id'])) {
-         throw new ImportFailureException('UUID or ID is mandatory');
+         throw new ImportFailureException(sprintf('UUID or ID is mandatory for %1$s', static::getTypeName(1)));
       }
 
       // restore key and FK

diff --git a/inc/form.class.php b/inc/form.class.php
@@ -1823,7 +1823,7 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
       global $DB;
 
       if (!isset($input['uuid']) && !isset($input['id'])) {
-         throw new ImportFailureException('UUID or ID is mandatory');
+         throw new ImportFailureException(sprintf('UUID or ID is mandatory for %1$s', static::getTypeName(1)));
       }
 
       $input['_skip_checks'] = true;

diff --git a/inc/form_profile.class.php b/inc/form_profile.class.php
@@ -166,7 +166,7 @@ public static function showForForm(CommonDBTM $item, $withtemplate = '') {
     */
    public static function import(PluginFormcreatorLinker $linker, $input = [], $containerId = 0) {
       if (!isset($input['uuid']) && !isset($input['id'])) {
-         throw new ImportFailureException('UUID or ID is mandatory');
+         throw new ImportFailureException(sprintf('UUID or ID is mandatory for %1$s', static::getTypeName(1)));
       }
 
       $formFk = PluginFormcreatorForm::getForeignKeyField();

diff --git a/inc/item_targetticket.class.php b/inc/item_targetticket.class.php
@@ -47,6 +47,10 @@ class PluginFormcreatorItem_TargetTicket extends CommonDBRelation
 
    static public $logs_for_item_1      = false;
 
+   public static function getTypeName($nb = 0) {
+      return _n('Composite ticket relation', 'Composite ticket relations', $nb, 'formcreator');
+   }
+
    public function export($remove_uuid = false) {
       if ($this->isNewItem()) {
          return false;
@@ -88,7 +92,7 @@ public function export($remove_uuid = false) {
 
    public static function import(PluginFormcreatorLinker $linker, $input = [], $containerId = 0) {
       if (!isset($input['uuid']) && !isset($input['id'])) {
-         throw new ImportFailureException('UUID or ID is mandatory');
+         throw new ImportFailureException(sprintf('UUID or ID is mandatory for %1$s', static::getTypeName(1)));
       }
 
       $targetTicketFk = PluginFormcreatorTargetTicket::getForeignKeyField();

diff --git a/inc/question.class.php b/inc/question.class.php
@@ -901,7 +901,7 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
       global $DB;
 
       if (!isset($input['uuid']) && !isset($input['id'])) {
-         throw new ImportFailureException('UUID or ID is mandatory');
+         throw new ImportFailureException(sprintf('UUID or ID is mandatory for %1$s', static::getTypeName(1)));
       }
 
       // restore key and FK

diff --git a/inc/questiondependency.class.php b/inc/questiondependency.class.php
@@ -62,6 +62,10 @@ public function __construct(PluginFormcreatorFieldInterface $field, array $optio
       $this->fieldtype = isset($options['fieldType']) ? $options['fieldType'] : [];
    }
 
+   public static function getTypeName($nb = 0) {
+      return _n('Question dependency', 'Question dependencies', $nb, 'formcreator');
+   }
+
    public function getParameterFormSize() {
       return 0;
    }
@@ -133,7 +137,7 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
       global $DB;
 
       if (!isset($input['uuid']) && !isset($input['id'])) {
-         throw new ImportFailureException('UUID or ID is mandatory');
+         throw new ImportFailureException(sprintf('UUID or ID is mandatory for %1$s', static::getTypeName(1)));
       }
 
       $questionFk = PluginFormcreatorQuestion::getForeignKeyField();

diff --git a/inc/questionrange.class.php b/inc/questionrange.class.php
@@ -47,6 +47,10 @@ class PluginFormcreatorQuestionRange
 
    protected $domId = 'plugin_formcreator_questionRange';
 
+   public static function getTypeName($nb = 0) {
+      return _n('Question range', 'Question ranges', $nb, 'formcreator');
+   }
+
    public function getParameterFormSize() {
       return 0;
    }
@@ -125,7 +129,7 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
       global $DB;
 
       if (!isset($input['uuid']) && !isset($input['id'])) {
-         throw new ImportFailureException('UUID or ID is mandatory');
+         throw new ImportFailureException(sprintf('UUID or ID is mandatory for %1$s', static::getTypeName(1)));
       }
 
       $questionFk = PluginFormcreatorQuestion::getForeignKeyField();

diff --git a/inc/questionregex.class.php b/inc/questionregex.class.php
@@ -47,6 +47,10 @@ class PluginFormcreatorQuestionRegex
 
    protected $domId = 'plugin_formcreator_questionRegex';
 
+   public static function getTypeName($nb = 0) {
+      return _n('Question regular expression', 'Question regular expressions', $nb, 'formcreator');
+   }
+
    public function getParameterFormSize() {
       return 1;
    }
@@ -120,7 +124,7 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
       global $DB;
 
       if (!isset($input['uuid']) && !isset($input['id'])) {
-         throw new ImportFailureException('UUID or ID is mandatory');
+         throw new ImportFailureException(sprintf('UUID or ID is mandatory for %1$s', static::getTypeName(1)));
       }
 
       $questionFk = PluginFormcreatorQuestion::getForeignKeyField();

diff --git a/inc/section.class.php b/inc/section.class.php
@@ -226,7 +226,7 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
       global $DB;
 
       if (!isset($input['uuid']) && !isset($input['id'])) {
-         throw new ImportFailureException('UUID or ID is mandatory');
+         throw new ImportFailureException(sprintf('UUID or ID is mandatory for %1$s', static::getTypeName(1)));
       }
 
       // restore key and FK

diff --git a/inc/target_actor.class.php b/inc/target_actor.class.php
@@ -80,6 +80,11 @@ static function getEnumRole() {
          // TODO : support ACTOR_ROLE_SUPPLIER
       ];
    }
+
+   public static function getTypeName($nb = 0) {
+      return _n('Target actor', 'Target actors', $nb, 'formcreator');
+   }
+
    public function prepareInputForAdd($input) {
 
       // generate a unique id
@@ -92,7 +97,7 @@ public function prepareInputForAdd($input) {
 
    public static function import(PluginFormcreatorLinker $linker, $input = [], $containerId = 0) {
       if (!isset($input['uuid']) && !isset($input['id'])) {
-         throw new ImportFailureException('UUID or ID is mandatory');
+         throw new ImportFailureException(sprintf('UUID or ID is mandatory for %1$s', static::getTypeName(1)));
       }
 
       $input[static::$items_id] = $containerId;

diff --git a/inc/targetchange.class.php b/inc/targetchange.class.php
@@ -135,7 +135,7 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
       global $DB;
 
       if (!isset($input['uuid']) && !isset($input['id'])) {
-         throw new ImportFailureException('UUID or ID is mandatory');
+         throw new ImportFailureException(sprintf('UUID or ID is mandatory for %1$s', static::getTypeName(1)));
       }
 
       $formFk = PluginFormcreatorForm::getForeignKeyField();

diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
@@ -1030,7 +1030,7 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
       global $DB;
 
       if (!isset($input['uuid']) && !isset($input['id'])) {
-         throw new ImportFailureException('UUID or ID is mandatory');
+         throw new ImportFailureException(sprintf('UUID or ID is mandatory for %1$s', static::getTypeName(1)));
       }
 
       $formFk = PluginFormcreatorForm::getForeignKeyField();