Fix Config.php relocation, fix header.phtml crashing due to old tab rendering
refs #4192
This commit is contained in:
parent
488310df37
commit
2a2966fc56
|
@ -4,7 +4,7 @@ use Icinga\Web\ActionController;
|
||||||
use Icinga\Web\Url;
|
use Icinga\Web\Url;
|
||||||
use Icinga\Application\Icinga;
|
use Icinga\Application\Icinga;
|
||||||
use Icinga\Web\Widget\Dashboard;
|
use Icinga\Web\Widget\Dashboard;
|
||||||
use Icinga\Application\Config as IcingaConfig;
|
use Icinga\Config\Config as IcingaConfig;
|
||||||
use Icinga\Form\Dashboard\AddUrlForm;
|
use Icinga\Form\Dashboard\AddUrlForm;
|
||||||
use Icinga\Exception\ConfigurationError;
|
use Icinga\Exception\ConfigurationError;
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
namespace Icinga\Form\Dashboard;
|
namespace Icinga\Form\Dashboard;
|
||||||
|
|
||||||
use Icinga\Application\Config as IcingaConfig;
|
use Icinga\Config\Config as IcingaConfig;
|
||||||
use Icinga\Web\Form;
|
use Icinga\Web\Form;
|
||||||
use Icinga\Web\Widget\Dashboard;
|
use Icinga\Web\Widget\Dashboard;
|
||||||
use Zend_Form_Element_Text;
|
use Zend_Form_Element_Text;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<? $showService = $object->service_description && $tabs->getActiveName() !== 'host' ?>
|
<? $showService = $object->service_description && $tabs->getActiveName() !== 'host' ?>
|
||||||
<? if (! $compact): ?>
|
<? if (! $compact): ?>
|
||||||
<?= $tabs ?>
|
<?= $tabs->render($this) ?>
|
||||||
<? endif ?>
|
<? endif ?>
|
||||||
<table style="margin-bottom: 1em">
|
<table style="margin-bottom: 1em">
|
||||||
<tr class="<?= $this->monitoringState($object, 'host') ?><?= $object->host_handled ? ' handled' : '' ?>">
|
<tr class="<?= $this->monitoringState($object, 'host') ?><?= $object->host_handled ? ' handled' : '' ?>">
|
||||||
|
|
Loading…
Reference in New Issue