Re-introduce getValues() override for subform values in wizard pages

Wizard pages don't subclass ConfigForm for which the patch was intended. Sorry for the bug. refs #10905
Icinga · Dec 23, 2015 · 23b51e8 · 23b51e8
1 parent 17dda6d
commit 23b51e8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
@@ -116,6 +116,21 @@ public function createElements(array $formData)
         $this->addSubForm($backendForm, 'backend_form');
     }
 
+    /**
+     * Retrieve all form element values
+     *
+     * @param   bool    $suppressArrayNotation  Ignored
+     *
+     * @return  array
+     */
+    public function getValues($suppressArrayNotation = false)
+    {
+        $values = parent::getValues();
+        $values = array_merge($values, $values['backend_form']);
+        unset($values['backend_form']);
+        return $values;
+    }
+
     /**
      * Validate the given form data and check whether it's possible to authenticate using the configured backend
      *

diff --git a/modules/setup/application/forms/UserGroupBackendPage.php b/modules/setup/application/forms/UserGroupBackendPage.php
@@ -129,4 +129,19 @@ public function createElements(array $formData)
             )
         );
     }
+
+    /**
+     * Retrieve all form element values
+     *
+     * @param   bool    $suppressArrayNotation  Ignored
+     *
+     * @return  array
+     */
+    public function getValues($suppressArrayNotation = false)
+    {
+        $values = parent::getValues();
+        $values = array_merge($values, $values['backend_form']);
+        unset($values['backend_form']);
+        return $values;
+    }
 }