fix(formanswer): show/hide questions in various cases

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Nov 27, 2018 · 87cc394 · 87cc394
1 parent 0c75a69
commit 87cc394
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 14 deletions.
diff --git a/inc/fields.class.php b/inc/fields.class.php
@@ -326,7 +326,7 @@ public static function updateVisibility($input) {
          $fields[$id] = PluginFormcreatorFields::getFieldInstance(
             $question->fields['fieldtype'],
             $question
-            );
+         );
          $fields[$id]->parseAnswerValues($input);
       }
 

diff --git a/inc/fields/textfield.class.php b/inc/fields/textfield.class.php
@@ -181,6 +181,9 @@ public static function getJSFields() {
 
    public function parseAnswerValues($input) {
       $key = 'formcreator_field_' . $this->fields['id'];
+      if (!isset($input[$key])) {
+         return false;
+      }
       if (!is_string($input[$key])) {
          return false;
       }

diff --git a/inc/form.class.php b/inc/form.class.php
@@ -920,7 +920,7 @@ public function displayUserForm() {
 
       // Display form
       $formName = 'formcreator_form' . $this->getID();
-      echo "<form name='" . $formName . "' method='post' role='form' enctype='multipart/form-data'
+      echo "<form name='form' method='post' role='form' enctype='multipart/form-data'
                action='". $CFG_GLPI['root_doc'] . "/plugins/formcreator/front/form.form.php'
                class='formcreator_form form_horizontal'>";
       echo "<h1 class='form-title'>";
@@ -966,7 +966,7 @@ class='formcreator_form form_horizontal'>";
          }
       }
       echo Html::scriptBlock('$(function() {
-         formcreatorShowFields($("form[name=\'' . $formName . '\']"));
+         formcreatorShowFields($("form[name=\'form\']"));
       })');
 
       // Show validator selector

diff --git a/inc/formanswer.class.php b/inc/formanswer.class.php
@@ -537,7 +537,18 @@ public function showForm($ID, $options = []) {
       $questions = $DB->request($request);
       $last_section = '';
       $questionsCount = $questions->count();
+      $fields = [];
       while ($question_line = $questions->next()) {
+         $question = new PluginFormcreatorQuestion();
+         $question->getFromDB($question_line['id']);
+         $fields[$question_line['id']] = PluginFormcreatorFields::getFieldInstance(
+            $question_line['fieldtype'],
+            $question
+         );
+         $fields[$question_line['id']]->deserializeValue($question_line['answer']);
+      }
+      $questions->rewind();
+      while ($question_line = $questions->current()) {
          // Get and display current section if needed
          if ($last_section != $question_line['section_name']) {
             echo '<h2>'.$question_line['section_name'].'</h2>';
@@ -548,19 +559,14 @@ public function showForm($ID, $options = []) {
             || ($question_line['fieldtype'] != "description"
                 && $question_line['fieldtype'] != "hidden")
          ) {
-            $question = new PluginFormcreatorQuestion();
-            $question->getFromDB($question_line['id']);
-            $field = PluginFormcreatorFields::getFieldInstance(
-               $question_line['fieldtype'],
-               $question
-            );
-            $field->deserializeValue($question_line['answer']);
-            $field->show($canEdit);
+            // if (PluginFormcreatorFields::isVisible($question_line['id'], $fields)) {
+            // }
+            $fields[$question_line['id']]->show($canEdit);
          }
+         $questions->next();
       }
-      $formName = 'formcreator_form' . $formId;
       echo Html::scriptBlock('$(function() {
-         formcreatorShowFields($("form[name=\'' . $formName . '\']"));
+         formcreatorShowFields($("form[name=\'form\']"));
       })');
 
       //add requester info
@@ -599,6 +605,8 @@ public function showForm($ID, $options = []) {
             echo '<input type="submit" name="accept_formanswer" class="submit_button" value="' . __('Accept', 'formcreator') . '" />';
             echo '</div>';
             echo '</div>';
+            $options['canedit'] = true;
+            $options['candel'] = false;
          }
       }
 

diff --git a/js/scripts.js.php b/js/scripts.js.php
@@ -583,7 +583,7 @@ function deleteTarget(items_id, token, target_id) {
 
 function formcreatorShowFields(form) {
    $.ajax({
-      url: '../ajax/showfields.php',
+      url: rootDoc + '/plugins/formcreator/ajax/showfields.php',
       type: "POST",
       data: form.serializeArray()
    }).done(function(response){