tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-16 18:34:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disable the LdapDiscoveryConfirmPage

Browse Source 
As long as the discovery code does not report multiple results, as it should,
actually, it's useless to demand the user to confirm the result.

resolves #8602
refs #8725
refs #8708
This commit is contained in:
Johannes Meyer 2015-03-12 16:14:50 +01:00
parent 8b7250bfa6
commit b37757ca6e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ class WebWizard extends Wizard implements SetupWizard
$this->addPage(new PreferencesPage()); $this->addPage(new PreferencesPage());
$this->addPage(new DbResourcePage()); $this->addPage(new DbResourcePage());
$this->addPage(new LdapDiscoveryPage()); $this->addPage(new LdapDiscoveryPage());
$this->addPage(new LdapDiscoveryConfirmPage()); //$this->addPage(new LdapDiscoveryConfirmPage());
$this->addPage(new LdapResourcePage()); $this->addPage(new LdapResourcePage());
$this->addPage(new AuthBackendPage()); $this->addPage(new AuthBackendPage());
$this->addPage(new AdminAccountPage()); $this->addPage(new AdminAccountPage());
@ -132,13 +132,13 @@ class WebWizard extends Wizard implements SetupWizard
} elseif ($authData['type'] === 'ldap') { } elseif ($authData['type'] === 'ldap') {
$page->setResourceConfig($this->getPageData('setup_ldap_resource')); $page->setResourceConfig($this->getPageData('setup_ldap_resource'));
$suggestions = $this->getPageData('setup_ldap_discovery_confirm'); $suggestions = $this->getPageData('setup_ldap_discovery');
if (isset($suggestions['backend'])) { if (isset($suggestions['backend'])) {
$page->populate($suggestions['backend']); $page->populate($suggestions['backend']);
} }
} }
} 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_admin_account') { } elseif ($page->getName() === 'setup_admin_account') {
$page->setBackendConfig($this->getPageData('setup_authentication_backend')); $page->setBackendConfig($this->getPageData('setup_authentication_backend'));
$authData = $this->getPageData('setup_authentication_type'); $authData = $this->getPageData('setup_authentication_type');
@ -169,7 +169,7 @@ class WebWizard extends Wizard implements SetupWizard
); );
} }
$suggestion = $this->getPageData('setup_ldap_discovery_confirm'); $suggestion = $this->getPageData('setup_ldap_discovery');
if (isset($suggestion['resource'])) { if (isset($suggestion['resource'])) {
$page->populate($suggestion['resource']); $page->populate($suggestion['resource']);
} }
@ -199,8 +199,8 @@ class WebWizard extends Wizard implements SetupWizard
} elseif ($newPage->getname() === 'setup_ldap_discovery') { } elseif ($newPage->getname() === 'setup_ldap_discovery') {
$authData = $this->getPageData('setup_authentication_type'); $authData = $this->getPageData('setup_authentication_type');
$skip = $authData['type'] !== 'ldap'; $skip = $authData['type'] !== 'ldap';
} elseif ($newPage->getName() === 'setup_ldap_discovery_confirm') { /*} elseif ($newPage->getName() === 'setup_ldap_discovery_confirm') {
$skip = false === $this->hasPageData('setup_ldap_discovery'); $skip = false === $this->hasPageData('setup_ldap_discovery');*/
} elseif ($newPage->getName() === 'setup_ldap_resource') { } elseif ($newPage->getName() === 'setup_ldap_resource') {
$authData = $this->getPageData('setup_authentication_type'); $authData = $this->getPageData('setup_authentication_type');
$skip = $authData['type'] !== 'ldap'; $skip = $authData['type'] !== 'ldap';