fix(QuestionCondition): inconsistency in selectors

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Nov 23, 2018 · ce7444f · ce7444f
1 parent d0c5cce
commit ce7444f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/inc/field.class.php b/inc/field.class.php
@@ -70,7 +70,7 @@ public function getValueForTarget() {
    public function show($canEdit = true) {
       $required = ($canEdit && $this->fields['required']) ? ' required' : '';
 
-      echo '<div class="form-group ' . $required . '" id="form-group-formcreator_field_' . $this->fields['id'] . '">';
+      echo '<div class="form-group ' . $required . '" id="form-group-field-' . $this->fields['id'] . '">';
       echo '<label for="formcreator_field_' . $this->fields['id'] . '">';
       echo $this->getLabel();
       if ($canEdit && $this->fields['required']) {

diff --git a/inc/fields.class.php b/inc/fields.class.php
@@ -268,11 +268,11 @@ public static function isVisible($id, $fields) {
          } else {
             switch ($currentLogic) {
                case 'AND' :
-                  $return &= $value;
+                  $return = ($return and $value);
                   break;
 
                case 'OR'  :
-                  $return |= $value;
+                  $return = ($return or $value);
                   break;
 
                default :
@@ -282,28 +282,27 @@ public static function isVisible($id, $fields) {
 
          if ($currentLogic == 'AND' && $nextLogic != 'AND') {
             if ($lowPrecedenceLogic == 'OR') {
-               $return |= $lowPrecedenceReturnPart;
+               $return = ($return or $lowPrecedenceReturnPart);
             } else {
-               $return ^= $lowPrecedenceReturnPart;
+               $return = ($return xor $lowPrecedenceReturnPart);
             }
          }
       }
 
       // Ensure the low precedence part is used if last condition has logic == AND
       if ($lowPrecedenceLogic == 'OR') {
-         $return |= $lowPrecedenceReturnPart;
+         $return = ($return or $lowPrecedenceReturnPart);
       } else {
-         $return ^= $lowPrecedenceReturnPart;
+         $return = ($return xor $lowPrecedenceReturnPart);
       }
 
       unset($evalQuestion[$id]);
 
-      // If the field is hidden by default, show it if condition is true
       if ($question->fields['show_rule'] == 'hidden') {
-         return ($return == true);
-
-         // else show it if condition is false
+         // If the field is hidden by default, show it if condition is true
+         return $return;
       } else {
+         // else show it if condition is false
          return !$return;
       }
    }
@@ -313,7 +312,7 @@ public static function isVisible($id, $fields) {
     *
     * @param array $input     values of all fields of the form
     *
-    * @rturn array
+    * @return array
     */
    public static function updateVisibility($input) {
       $fields = [];
@@ -332,7 +331,7 @@ public static function updateVisibility($input) {
       }
 
       $questionToShow = [];
-      foreach ($input as $id => $value) {
+      foreach ($fields as $id => $value) {
          $questionToShow[$id] = PluginFormcreatorFields::isVisible($id, $fields);
       }
 

diff --git a/js/scripts.js.php b/js/scripts.js.php
@@ -596,17 +596,18 @@ function formcreatorShowFields(form) {
       }
       var i = 0;
       for (var questionKey in questionToShow) {
-         var questionId = parseInt(questionKey.replace('formcreator_field_', ''));
+         var questionId = questionKey;
+         questionId = parseInt(questionKey.replace('formcreator_field_', ''));
          if (!isNaN(questionId)) {
             if (questionToShow[questionKey]) {
-               $('#form-group-' + questionKey).show();
+               $('#form-group-field' + questionKey).show();
                i++;
-               $('#form-group-' + questionKey).removeClass('line' + (i+1) % 2);
-               $('#form-group-' + questionKey).addClass('line' + i%2);
+               $('#form-group-field' + questionKey).removeClass('line' + (i+1) % 2);
+               $('#form-group-field' + questionKey).addClass('line' + i%2);
             } else {
-               $('#form-group-' + questionKey).hide();
-               $('#form-group-' + questionKey).removeClass('line0');
-               $('#form-group-' + questionKey).removeClass('line1');
+               $('#form-group-field' + questionKey).hide();
+               $('#form-group-field' + questionKey).removeClass('line0');
+               $('#form-group-field' + questionKey).removeClass('line1');
             }
          }
       }