parent
52c452c044
commit
cd9e3693e4
|
@ -296,7 +296,7 @@ class Monitoring_ListController extends Controller
|
|||
->order('downtime_scheduled_start', 'DESC');
|
||||
|
||||
$this->applyFilters($query);
|
||||
$this->view->downtimes = $query->paginate();
|
||||
|
||||
$this->setupSortControl(array(
|
||||
'downtime_is_in_effect' => $this->translate('Is In Effect'),
|
||||
'downtime_host' => $this->translate('Host / Service'),
|
||||
|
@ -308,6 +308,8 @@ class Monitoring_ListController extends Controller
|
|||
'downtime_scheduled_end' => $this->translate('Scheduled End'),
|
||||
'downtime_duration' => $this->translate('Duration'),
|
||||
));
|
||||
|
||||
$this->view->downtimes = $query->paginate();
|
||||
$this->view->delDowntimeForm = new DeleteDowntimeCommandForm();
|
||||
}
|
||||
|
||||
|
|
|
@ -3,6 +3,9 @@
|
|||
<?= $this->tabs->render($this); ?>
|
||||
<div style="margin: 1em" class="dontprint">
|
||||
<?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
|
||||
<?php if (! $this->filterEditor): ?>
|
||||
<?= $this->filterPreview ?>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?= $this->widget('limiter', array('url' => $this->url, 'max' => $downtimes->count())); ?>
|
||||
<?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
|
||||
|
@ -10,6 +13,7 @@
|
|||
<?php endif ?>
|
||||
|
||||
<div class="content">
|
||||
<?= $this->filterEditor ?>
|
||||
<?php if (empty($downtimes)): ?>
|
||||
<?= $this->translate('No downtimes matching the filter'); ?>
|
||||
</div>
|
||||
|
|
|
@ -16,6 +16,7 @@ class DowntimeQuery extends IdoQuery
|
|||
protected $columnMap = array(
|
||||
'downtime' => array(
|
||||
'downtime_author' => 'sd.author_name',
|
||||
'author' => 'sd.author_name',
|
||||
'downtime_comment' => 'sd.comment_data',
|
||||
'downtime_entry_time' => 'UNIX_TIMESTAMP(sd.entry_time)',
|
||||
'downtime_is_fixed' => 'sd.is_fixed',
|
||||
|
|
|
@ -16,6 +16,7 @@ class Downtime extends DataView
|
|||
return array(
|
||||
'downtime_objecttype',
|
||||
'downtime_author',
|
||||
'author',
|
||||
'downtime_comment',
|
||||
'downtime_entry_time',
|
||||
'downtime_is_fixed',
|
||||
|
|
Loading…
Reference in New Issue