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

Set default port for Postgres connections if it's the first available driver 

refs #9683
This commit is contained in:
Eric Lippmann 2015-09-17 12:46:49 +02:00
parent f46504554e
commit 06c6b09863
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
application/forms/Config/Resource/DbResourceForm.php
View File

@ -30,20 +30,26 @@ class DbResourceForm extends Form
if (Platform::hasMysqlSupport()) { if (Platform::hasMysqlSupport()) {
$dbChoices['mysql'] = 'MySQL'; $dbChoices['mysql'] = 'MySQL';
} }
if (Platform::hasPostgresqlSupport()) {
$dbChoices['pgsql'] = 'PostgreSQL';
}
if (Platform::hasMssqlSupport()) { if (Platform::hasMssqlSupport()) {
$dbChoices['mssql'] = 'MSSQL'; $dbChoices['mssql'] = 'MSSQL';
} }
if (Platform::hasOciSupport()) {
$dbChoices['oci'] = 'Oracle (OCI8)';
}
if (Platform::hasOracleSupport()) { if (Platform::hasOracleSupport()) {
$dbChoices['oracle'] = 'Oracle'; $dbChoices['oracle'] = 'Oracle';
} }
if (Platform::hasPostgresqlSupport()) { if (Platform::hasOciSupport()) {
$dbChoices['pgsql'] = 'PostgreSQL'; $dbChoices['oci'] = 'Oracle (OCI8)';
}
$offerPostgres = false;
if (isset($formData['db'])) {
if ($formData['db'] === 'pgsql') {
$offerPostgres = true;
}
} elseif (key($dbChoices) === 'pgsql') {
$offerPostgres = true;
} }
$this->addElement( $this->addElement(
'text', 'text',
'name', 'name',
@ -81,8 +87,8 @@ class DbResourceForm extends Form
'description' => $this->translate('The port to use'), 'description' => $this->translate('The port to use'),
'label' => $this->translate('Port'), 'label' => $this->translate('Port'),
'preserveDefault' => true, 'preserveDefault' => true,
'required' => isset($formData['db']) && $formData['db'] === 'pgsql', 'required' => $offerPostgres,
'value' => isset($formData['db']) && $formData['db'] === 'pgsql' ? 5432 : null 'value' => $offerPostgres ? 5432 : null
) )
); );
$this->addElement( $this->addElement(