tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/History-grid-should-allow-filters-6638' 

fixes #6638
This commit is contained in:
Alexander Klimov 2014-11-26 16:31:55 +01:00
parent a3fa31c35a 0b3e306b8a
commit ecc49d3f86
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -604,6 +604,7 @@ class Monitoring_ListController extends Controller
$this->applyFilter($query); $this->applyFilter($query);
$this->filterQuery($query);
$this->setupSortControl(array( $this->setupSortControl(array(
'timestamp' => 'Occurence' 'timestamp' => 'Occurence'
)); ));

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

@ -1,8 +1,10 @@
<?php if (false === $this->compact): ?> <?php if (false === $this->compact): ?>
<div class="controls"> <div class="controls">
<?= $this->tabs->render($this); ?> <?= $this->tabs ?>
<div style="margin: 1em" class="dontprint"> <div style="margin: 1em" class="dontprint">
<?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?> <div style="float: right">
<?= $this->translate('Sort by') ?> <?= $this->sortControl ?>
</div>
</div> </div>
<?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?> <?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>
@ -12,6 +14,7 @@
<?php endif ?> <?php endif ?>
<div class="content"> <div class="content">
<?= $this->filterEditor ?>
<?php if (empty($history)): ?> <?php if (empty($history)): ?>
<?= $this->translate('No history events matching the filter') ?> <?= $this->translate('No history events matching the filter') ?>
</div> </div>