tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Eric Lippmann 2015-12-23 14:07:19 +01:00
parent 17dda6df4e
commit 23b51e8b52
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/setup/application/forms/AuthBackendPage.php
View File

@ -116,6 +116,21 @@ class AuthBackendPage extends Form
$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
*

15
modules/setup/application/forms/UserGroupBackendPage.php
View File

@ -129,4 +129,19 @@ class UserGroupBackendPage extends 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;
}
}