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

Do not show the db-creation step when the db-resource step was skipped 

refs #7163
This commit is contained in:
Johannes Meyer 2014-10-08 15:35:12 +02:00
parent 06e82ed892
commit 8fa8642917
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/Icinga/Application/WebSetup.php
View File

@ -22,7 +22,6 @@ use Icinga\Web\Request;
use Icinga\Web\Setup\DbTool;
use Icinga\Web\Setup\SetupWizard;
use Icinga\Web\Setup\Requirements;
use Icinga\Application\Platform;
/**
* Icinga Web 2 Setup Wizard
@ -136,8 +135,8 @@ class WebSetup extends Wizard implements SetupWizard
$authData = $this->getPageData('setup_authentication_type');
$skip = $authData['type'] !== 'ldap';
} elseif ($newPage->getName() === 'setup_database_creation') {
if ($this->hasPageData('setup_db_resource')) {
$db = new DbTool($this->getPageData('setup_db_resource'));
if (($config = $this->getPageData('setup_db_resource')) !== null && ! $config['skip_validation']) {
$db = new DbTool($config);
try {
$db->connectToDb();