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

Do not overwrite __construct() in forms, there's init() for that purpose 

refs #5525
This commit is contained in:
Johannes Meyer 2014-08-11 10:39:13 +02:00
parent c36e30af1e
commit d260c3fb94
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/forms/Config/Authentication/DbBackendForm.php
View File

@ -20,19 +20,27 @@ class DbBackendForm extends BaseBackendForm
*/
protected $resources;
public function __construct()
/**
* Initialize this form
*
* Populates $this->resources.
*
* @throws ConfigurationError In case no database resources can be found
*/
public function init()
{
$dbResources = array_keys(
ResourceFactory::getResourceConfigs('db')->toArray()
);
if (empty($dbResources)) {
throw new ConfigurationError(
t('There are no database resources')
);
}
$this->resources = array_combine($dbResources, $dbResources);
parent::__construct();
// array_combine() is necessary in order to use the array as select input data
$this->resources = array_combine($dbResources, $dbResources);
}
public function createElements(array $formData)

14
application/forms/Config/Authentication/LdapBackendForm.php
View File

@ -21,19 +21,27 @@ class LdapBackendForm extends BaseBackendForm
*/
protected $resources;
public function __construct()
/**
* Initialize this form
*
* Populates $this->resources.
*
* @throws ConfigurationError In case no database resources can be found
*/
public function init()
{
$ldapResources = array_keys(
ResourceFactory::getResourceConfigs('ldap')->toArray()
);
if (empty($ldapResources)) {
throw new ConfigurationError(
t('There are no LDAP resources')
);
}
$this->resources = array_combine($ldapResources, $ldapResources);
parent::__construct();
// array_combine() is necessary in order to use the array as select input data
$this->resources = array_combine($ldapResources, $ldapResources);
}
public function createElements(array $formData)