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

Allow install steps to return no summary

Browse Source 
refs #7163
This commit is contained in:
Johannes Meyer 2014-10-28 15:12:40 +01:00
parent dbf5512252
commit 3c438d9221
5 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/scripts/form/setup-summary.phtml
View File

@ -13,9 +13,11 @@ use Icinga\Web\Wizard;
); ?></p> ); ?></p>
<div class="summary"> <div class="summary">
<?php foreach ($form->getSummary() as $pageHtml): ?> <?php foreach ($form->getSummary() as $pageHtml): ?>
<?php if ($pageHtml): ?>
<div class="page"> <div class="page">
<?= $pageHtml; ?> <?= $pageHtml; ?>
</div> </div>
<?php endif ?>
<?php endforeach ?> <?php endforeach ?>
</div> </div>
<form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>"> <form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">

2
application/views/scripts/setup/parts/install.phtml
View File

@ -2,7 +2,7 @@
<div class="report"> <div class="report">
<?php $firstLine = true; ?> <?php $firstLine = true; ?>
<?php foreach ($report as $entry): ?> <?php foreach ($report as $entry): ?>
<?php if ($entry !== ''): ?> <?php if ($entry): ?>
<?php if (false === $firstLine): ?> <?php if (false === $firstLine): ?>
<div class="line-separator"></div> <div class="line-separator"></div>
<?php endif ?> <?php endif ?>

2
library/Icinga/Installation/DatabaseStep.php
View File

@ -235,8 +235,6 @@ class DatabaseStep extends Step
return '<p>' . join('</p><p>', $this->messages) . '</p>' return '<p>' . join('</p><p>', $this->messages) . '</p>'
. '<p class="error">' . $message . '</p><p>' . $this->error->getMessage() . '</p>'; . '<p class="error">' . $message . '</p><p>' . $this->error->getMessage() . '</p>';
} }
return '';
} }
protected function log() protected function log()

2
library/Icinga/Installation/GeneralConfigStep.php
View File

@ -128,7 +128,5 @@ class GeneralConfigStep extends Step
return '<p class="error">' . sprintf($message, Config::resolvePath('config.ini')) . '</p>' return '<p class="error">' . sprintf($message, Config::resolvePath('config.ini')) . '</p>'
. '<p>' . $this->error->getMessage() . '</p>'; . '<p>' . $this->error->getMessage() . '</p>';
} }
return '';
} }
} }

2
library/Icinga/Installation/ResourceStep.php
View File

@ -146,7 +146,5 @@ class ResourceStep extends Step
return '<p class="error">' . sprintf($message, Config::resolvePath('resources.ini')) . '</p>' return '<p class="error">' . sprintf($message, Config::resolvePath('resources.ini')) . '</p>'
. '<p>' . $this->error->getMessage() . '</p>'; . '<p>' . $this->error->getMessage() . '</p>';
} }
return '';
} }
} }