fix(form): hidden questions still consume 10 pixels height

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Mar 5, 2020 · afa2ea3 · afa2ea3
1 parent f0f60a5
commit afa2ea3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/css/styles.css b/css/styles.css
@@ -223,7 +223,7 @@ form.formcreator_form {
 }
 
 .formcreator_form .form-group {
-   padding: 5px 15px;
+   padding: 0 15px;
 }
 
 .formcreator_form .form-group > label {

diff --git a/inc/form.class.php b/inc/form.class.php
@@ -1898,7 +1898,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('');
       }
 
       $formFk = PluginFormcreatorForm::getForeignKeyField();

diff --git a/inc/question.class.php b/inc/question.class.php
@@ -1003,6 +1003,9 @@ public static function import(PluginFormcreatorLinker $linker, $input = [], $con
       if (isset($input['_parameters'])) {
          $parameters = $field->getParameters();
          foreach ($parameters as $fieldName => $parameter) {
+            if (false === ($input['_parameters'][$input['fieldtype']][$fieldName])) {
+               continue;
+            }
             $parameter::import($linker, $input['_parameters'][$input['fieldtype']][$fieldName], $itemId);
          }
       }

diff --git a/inc/questionregex.class.php b/inc/questionregex.class.php
@@ -120,7 +120,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('');
       }
 
       $questionFk = PluginFormcreatorQuestion::getForeignKeyField();