fix(form): not well restored save answers after invalid submission

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jan 28, 2020 · 9233628 · 9233628
1 parent 4fe46ee
commit 9233628
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/inc/form.class.php b/inc/form.class.php
@@ -1299,6 +1299,9 @@ public function displayUserForm() {
          echo '</li>';
       }
 
+      // Delete saved answers if any
+      unset($_SESSION['formcreator']['data']);
+
       // Show validator selector
       if ($this->fields['validation_required'] != PluginFormcreatorForm_Validator::VALIDATION_NONE) {
          $validators = [];

diff --git a/inc/question.class.php b/inc/question.class.php
@@ -171,7 +171,7 @@ public function getDesignHtml() {
       $sectionId = $this->fields[PluginFormcreatorSection::getForeignKeyField()];
       $fieldType = 'PluginFormcreator' . ucfirst($this->fields['fieldtype']) . 'Field';
       $field = new $fieldType($this);
-      
+
       $html .= '<div class="grid-stack-item"'
       . ' data-itemtype="' . self::class . '"'
       . ' data-id="'.$questionId.'"'
@@ -226,10 +226,8 @@ public function getRenderedHtml($canEdit = true, $value = []) {
       if (!$field->isPrerequisites()) {
          return '';
       }
-      if (isset($_SESSION['formcreator']['data']['formcreator_field_' . $this->getID()])) {
-         $field->parseAnswerValues($_SESSION['formcreator']['data']['formcreator_field_' . $this->getID()]);
-      } else if (count($value) > 0) {
-         $field->parseAnswerValues($value);
+      if (isset($_SESSION['formcreator']['data'])) {
+         $field->parseAnswerValues($_SESSION['formcreator']['data']);
       } else {
          $field->deserializeValue($this->fields['default_values']);
       }
@@ -340,7 +338,7 @@ private function checkBeforeSave($input) {
 
       // Might need to merge $this->fields and $input, $input having precedence
       // over $this->fields
-      $input['default_values'] = $this->field->serializeValue();
+      //$input['default_values'] = $this->field->serializeValue();
 
       return $input;
    }
@@ -380,9 +378,6 @@ public function prepareInputForAdd($input) {
       } else {
          $input['row'] = $maxRow + 1;
       }
-      // if (!isset($input['height'])) {
-      //    $input['height'] = '1';
-      // }
 
       // generate a unique id
       if (!isset($input['uuid'])
@@ -413,7 +408,7 @@ public function prepareInputForUpdate($input) {
          return false;
       }
 
-      // generate a uSnique id
+      // generate a unique id
       if (!isset($input['uuid'])
           || empty($input['uuid'])) {
          if (!isset($this->fields['uuid']) && $this->fields['uuid'] != $input['uuid']) {
@@ -467,9 +462,9 @@ protected function serializeDefaultValue($input) {
       return $input;
    }
 
-   /** 
+   /**
     * Update size or position of the question
-    * @param array $input 
+    * @param array $input
     * @return boolean false on error
     */
    public function change($input) {
@@ -632,7 +627,7 @@ public function post_purgeItem() {
          //      'row' => ['>', $row],
          //      $sectionFk => $this->fields[$sectionFk]
          //   ]
-         // );   
+         // );
       }
 
       // Always show questions with conditional display on the question being deleted