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

Add module dependencies to requirements page

Browse Source
This commit is contained in:
Sukhwinder Dhillon 2022-07-26 15:06:09 +02:00
parent e390a61d18
commit 5ef89e5166
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/setup/application/forms/ModulePage.php
View File

@ -5,6 +5,7 @@ namespace Icinga\Module\Setup\Forms;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Application\Modules\Module; use Icinga\Application\Modules\Module;
use Icinga\Module\Setup\ModuleDependency;
use Icinga\Web\Form; use Icinga\Web\Form;
class ModulePage extends Form class ModulePage extends Form
@ -100,6 +101,8 @@ class ModulePage extends Form
foreach ($checked as $name => $module) { foreach ($checked as $name => $module) {
if ($module->providesSetupWizard()) { if ($module->providesSetupWizard()) {
$wizards[$name] = $module->getSetupWizard(); $wizards[$name] = $module->getSetupWizard();
} elseif (! empty($module->getRequiredModules())) {
$wizards[$name] = new ModuleDependency($module, array_keys($checked));
} }
} }

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

@ -119,7 +119,9 @@ class WebWizard extends Wizard implements SetupWizard
if (($modulePageData = $this->getPageData('setup_modules')) !== null) { if (($modulePageData = $this->getPageData('setup_modules')) !== null) {
$modulePage = $this->getPage('setup_modules')->populate($modulePageData); $modulePage = $this->getPage('setup_modules')->populate($modulePageData);
foreach ($modulePage->getModuleWizards() as $moduleWizard) { foreach ($modulePage->getModuleWizards() as $moduleWizard) {
$this->addPage($moduleWizard); if (! $moduleWizard instanceof ModuleDependency) {
$this->addPage($moduleWizard);
}
} }
} }
} }