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

list/eventhistory: Ensure dashboard compliance

Browse Source 
refs #7876
This commit is contained in:
Johannes Meyer 2015-04-17 16:15:58 +02:00
parent faa29e3dee
commit 7be00791a7
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/monitoring/application/controllers/ListController.php
View File

@ -624,6 +624,7 @@ class Monitoring_ListController extends Controller
if ($url = $this->hasBetterUrl()) { if ($url = $this->hasBetterUrl()) {
return $this->redirectNow($url); return $this->redirectNow($url);
} }
$this->addTitleTab( $this->addTitleTab(
'eventhistory', 'eventhistory',
$this->translate('Event Overview'), $this->translate('Event Overview'),
@ -645,11 +646,13 @@ class Monitoring_ListController extends Controller
)); ));
$this->filterQuery($query); $this->filterQuery($query);
$this->view->history = $query->paginate();
$this->setupLimitControl();
$this->setupPaginationControl($this->view->history);
$this->setupSortControl(array( $this->setupSortControl(array(
'timestamp' => $this->translate('Occurence') 'timestamp' => $this->translate('Occurence')
)); ));
$this->view->history = $query->paginate();
} }
public function servicegridAction() public function servicegridAction()

33
modules/monitoring/application/views/scripts/list/eventhistory.phtml
View File

@ -1,32 +1,23 @@
<?php <?php
use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Host;
use Icinga\Module\Monitoring\Object\Service; use Icinga\Module\Monitoring\Object\Service;
?> if (! $this->compact): ?>
<?php if (false === $this->compact): ?>
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs; ?>
<div style="margin: 1em" class="dontprint"> <?= $this->sortBox; ?>
<div style="float: right"> <?= $this->limiter; ?>
<?= $this->translate('Sort by') ?> <?= $this->sortControl ?> <?= $this->paginator; ?>
</div> <?= $this->filterEditor; ?>
</div>
<?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>
<?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
</div> </div>
<?php endif ?> <?php endif ?>
<div class="content"> <div class="content">
<?= $this->filterEditor ?> <?php
<?php if (count($history) === 0): ?> if (count($history) === 0) {
<?= $this->translate('No history events matching the filter') ?> echo $this->translate('No history events found matching the filter') . '</div>';
</div> return;
<?php return; endif ?> }
?>
<table data-base-target="_next" class="action"> <table data-base-target="_next" class="action">
<tbody> <tbody>
<?php foreach ($history as $event): ?> <?php foreach ($history as $event): ?>