fix(condition): loss of condition on submit button

also improve questions dropdown to edit conditions Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jan 20, 2021 · 42d5fed · 42d5fed
1 parent 92629fe
commit 42d5fed
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/inc/condition.class.php b/inc/condition.class.php
@@ -376,14 +376,13 @@ public function getConditionHtml(array $input) : string {
          PluginFormcreatorSection::getForeignKeyField() => $sectionsList,
       ];
       $html.= '<div class="div_show_condition_field">';
-      $html.= PluginFormcreatorQuestion::dropdown(
+      $html .= PluginFormcreatorQuestion::dropdownForForm(
+         $form->getID(),
+         $questionListExclusion,
+         '_conditions[plugin_formcreator_questions_id][]',
+         $questionId,
          [
-            'name' => '_conditions[plugin_formcreator_questions_id][]',
-            'value'     => $questionId,
-            'comments'  => false,
-            'condition' => $questionListExclusion,
-            'rand'      => $rand,
-            'display'   => false,
+            'display' => false,
          ]
       );
       $html.= '</div>';

diff --git a/inc/question.class.php b/inc/question.class.php
@@ -1114,10 +1114,16 @@ public function getQuestionsFromFormBySection($formId, $crit = []) {
       return $items;
    }
 
-   public static function dropdownForForm($formId, $crit, $name, $value) {
+   public static function dropdownForForm($formId, $crit, $name, $value, $options = []) {
       $question = new self();
       $items = $question->getQuestionsFromFormBySection($formId, $crit);
-      Dropdown::showFromArray($name, $items, $value);
+      $options = [
+         'display' => $options['display'] ?? true,
+         'value'   => $value,
+      ];
+      $output = Dropdown::showFromArray($name, $items, $options);
+
+      return $output;
    }
 
    /**