fix(condition): fix inconsistency when checking question conditions

fix #829
pluginsGLPI · Jan 2, 2018 · a820e55 · a820e55
1 parent f183091
commit a820e55
Show file tree

Hide file tree

Showing 5 changed files with 210 additions and 208 deletions.
diff --git a/inc/fields.class.php b/inc/fields.class.php
@@ -160,7 +160,7 @@ public static function isVisible($id, $values) {
       foreach ($questionConditions as $question_condition) {
          $conditions[] = [
             'logic'    => $question_condition->getField('show_logic'),
-            'field'    => $question_condition->getField('show_field'),
+            'field'    => 'formcreator_field_' . $question_condition->getField('show_field'),
             'operator' => $question_condition->getField('show_condition'),
             'value'    => $question_condition->getField('show_value')
          ];

diff --git a/inc/form.class.php b/inc/form.class.php
@@ -914,8 +914,8 @@ class='formcreator_form form_horizontal'>";
          }
       }
       echo Html::scriptBlock('$(function() {
-               formcreatorShowFields();
-            })');
+         formcreatorShowFields();
+      })');
 
       // Show validator selector
       if ($item->fields['validation_required'] > 0) {
@@ -1106,7 +1106,7 @@ public function saveForm($input) {
       $valid = true;
       $data  = [];
 
-      // Validate form fields
+      // Prepare form fields for validation
       $question = new PluginFormcreatorQuestion();
       $found_questions = $question->getQuestionsFromForm($this->getID());
       foreach ($found_questions as $id => $question) {
@@ -1125,7 +1125,10 @@ public function saveForm($input) {
          } else {
             $data['formcreator_field_' . $id] = '';
          }
+      }
 
+      // Validate form fields
+      foreach ($found_questions as $id => $question) {
          $className = 'PluginFormcreator' . ucfirst($question->getField('fieldtype')) . 'Field';
 
          if (class_exists($className)) {

diff --git a/js/scripts.js.php b/js/scripts.js.php
@@ -531,7 +531,7 @@ function deleteTarget(items_id, token, target_id) {
 var formcreatorQuestions = new Object();
 
 function formcreatorChangeValueOf(field_id, value) {
-   formcreatorQuestions[field_id] = value;
+   formcreatorQuestions['formcreator_field_' + field_id] = value;
    formcreatorShowFields();
 }
 function formcreatorAddValueOf(field_id, value) {