tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-04-08 17:15:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Wizard: Make it unambiguous what the first database configuration is for

Browse Source 
fixes #9654
This commit is contained in:
Johannes Meyer 2015-08-05 16:20:03 +02:00
parent e2e1692462
commit 35ea3cc9ee
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/setup/application/forms/DbResourcePage.php
View File

@ -19,10 +19,6 @@ class DbResourcePage extends Form
public function init() public function init()
{ {
$this->setTitle($this->translate('Database Resource', 'setup.page.title')); $this->setTitle($this->translate('Database Resource', 'setup.page.title'));
$this->addDescription($this->translate(
'Now please configure your database resource. Note that the database itself does not need to'
. ' exist at this time as it is going to be created once the wizard is about to be finished.'
));
$this->setValidatePartial(true); $this->setValidatePartial(true);
} }

16
modules/setup/library/Setup/WebWizard.php
View File

@ -163,6 +163,14 @@ class WebWizard extends Wizard implements SetupWizard
} }
/*} elseif ($page->getName() === 'setup_ldap_discovery_confirm') { /*} elseif ($page->getName() === 'setup_ldap_discovery_confirm') {
$page->setResourceConfig($this->getPageData('setup_ldap_discovery'));*/ $page->setResourceConfig($this->getPageData('setup_ldap_discovery'));*/
} elseif ($page->getName() === 'setup_auth_db_resource') {
$page->addDescription($this->translate(
'Now please configure the database resource where to store users and user groups.'
));
$page->addDescription($this->translate(
'Note that the database itself does not need to exist at this time as'
. ' it is going to be created once the wizard is about to be finished.'
));
} elseif ($page->getName() === 'setup_usergroup_backend') { } elseif ($page->getName() === 'setup_usergroup_backend') {
$page->setResourceConfig($this->getPageData('setup_ldap_resource')); $page->setResourceConfig($this->getPageData('setup_ldap_resource'));
$page->setBackendConfig($this->getPageData('setup_authentication_backend')); $page->setBackendConfig($this->getPageData('setup_authentication_backend'));
@ -187,6 +195,14 @@ class WebWizard extends Wizard implements SetupWizard
$page->setSubjectTitle('Icinga Web 2'); $page->setSubjectTitle('Icinga Web 2');
$page->setSummary($this->getSetup()->getSummary()); $page->setSummary($this->getSetup()->getSummary());
} elseif ($page->getName() === 'setup_config_db_resource') { } elseif ($page->getName() === 'setup_config_db_resource') {
$page->addDescription($this->translate(
'Now please configure the database resource where to store user preferences.'
));
$page->addDescription($this->translate(
'Note that the database itself does not need to exist at this time as'
. ' it is going to be created once the wizard is about to be finished.'
));
$ldapData = $this->getPageData('setup_ldap_resource'); $ldapData = $this->getPageData('setup_ldap_resource');
if ($ldapData !== null && $request->getPost('name') === $ldapData['name']) { if ($ldapData !== null && $request->getPost('name') === $ldapData['name']) {
$page->error( $page->error(