fix(condition): fix show hide issues

Author: btry

inc/field.class.php

@@ -81,7 +81,7 @@ public function prepareQuestionInputForTarget($input) {
    public function show($canEdit = true) {
       $required = ($canEdit && $this->fields['required']) ? ' required' : '';
 
-      echo '<div class="form-group ' . $required . '" id="form-group-field' . $this->fields['id'] . '">';
+      echo '<div class="form-group ' . $required . '" id="form-group-formcreator_field_' . $this->fields['id'] . '">';
       echo '<label for="formcreator_field_' . $this->fields['id'] . '">';
       echo $this->getLabel();
       if ($canEdit && $this->fields['required']) {

inc/fields.class.php

@@ -291,7 +291,7 @@ public static function isVisible($id, $values) {
 
       // If the field is hidden by default, show it if condition is true
       if ($question->fields['show_rule'] == 'hidden') {
-         return $return;
+         return ($return == true);
 
          // else show it if condition is false
       } else {

inc/form.class.php

@@ -991,7 +991,7 @@ class='formcreator_form form_horizontal'>";
       echo '</div>';
 
       echo '<input type="hidden" name="formcreator_form" value="' . $item->getID() . '">';
-      echo '<input type="hidden" name="_glpi_csrf_token" value="' . Session::getNewCSRFToken() . '">';
+      echo Html::hidden('_glpi_csrf_token', ['value' => Session::getNewCSRFToken()]);
       echo '<input type="hidden" name="uuid" value="' .$item->fields['uuid'] . '">';
       echo '</form>';
    }

js/scripts.js.php

@@ -535,7 +535,7 @@ function formcreatorChangeValueOf(field_id, value) {
    formcreatorShowFields();
 }
 function formcreatorAddValueOf(field_id, value) {
-   formcreatorQuestions[field_id] = value;
+   formcreatorQuestions['formcreator_field_' + field_id] = value;
 }
 
 function formcreatorShowFields() {
@@ -550,14 +550,14 @@ function formcreatorShowFields() {
       var i = 0;
       for (question in formcreatorQuestions) {
          if (questionToShow[question]) {
-            $('#form-group-field' + question).show();
+            $('#form-group-' + question).show();
             i++;
-            $('#form-group-field' + question).removeClass('line' + (i+1) % 2);
-            $('#form-group-field' + question).addClass('line' + i%2);
+            $('#form-group-' + question).removeClass('line' + (i+1) % 2);
+            $('#form-group-' + question).addClass('line' + i%2);
          } else {
-            $('#form-group-field' + question).hide();
-            $('#form-group-field' + question).removeClass('line0');
-            $('#form-group-field' + question).removeClass('line1');
+            $('#form-group-' + question).hide();
+            $('#form-group-' + question).removeClass('line0');
+            $('#form-group-' + question).removeClass('line1');
          }
       }
    });