mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-07-27 07:44:04 +02:00
monitoring: Remove filter widgets in the event overview / history view
They did not work.
This commit is contained in:
parent
dc699058b9
commit
eddb00cbc1
@ -40,6 +40,24 @@ class Monitoring_ListController extends Controller
|
|||||||
$this->url = Url::fromRequest();
|
$this->url = Url::fromRequest();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated DO NOT USE. THIS IS A HACK. This is removed once we fix the eventhistory action w/ filters.
|
||||||
|
*/
|
||||||
|
protected function applyFilter($query)
|
||||||
|
{
|
||||||
|
$params = clone $this->params;
|
||||||
|
$params->shift('format');
|
||||||
|
$params->shift('limit');
|
||||||
|
$params->shift('page');
|
||||||
|
$params->shift('view');
|
||||||
|
if ($sort = $params->shift('sort')) {
|
||||||
|
$query->order($sort, $params->shift('dir'));
|
||||||
|
}
|
||||||
|
$query->applyFilter(Filter::fromQuerystring((string) $params));
|
||||||
|
$this->handleFormatRequest($query);
|
||||||
|
return $query;
|
||||||
|
}
|
||||||
|
|
||||||
protected function hasBetterUrl()
|
protected function hasBetterUrl()
|
||||||
{
|
{
|
||||||
$request = $this->getRequest();
|
$request = $this->getRequest();
|
||||||
@ -570,24 +588,6 @@ class Monitoring_ListController extends Controller
|
|||||||
}
|
}
|
||||||
$this->addTitleTab('eventhistory', $this->translate('Event Overview'));
|
$this->addTitleTab('eventhistory', $this->translate('Event Overview'));
|
||||||
|
|
||||||
$form = new EventOverviewForm();
|
|
||||||
$form->handleRequest($this->getRequest());
|
|
||||||
$this->view->form = $form;
|
|
||||||
|
|
||||||
if ($this->getRequest()->isPost() && !$this->getParam('modifyFilter')) {
|
|
||||||
// update filter string
|
|
||||||
$filters = $form->getFilter();
|
|
||||||
$url = $this->_request->getUrl();
|
|
||||||
$url->setQueryString($filters->toQueryString());
|
|
||||||
if ($this->getParam('sort') !== null) {
|
|
||||||
$url->setParam('sort', $this->getParam('sort'));
|
|
||||||
}
|
|
||||||
if ($this->getParam('dir') !== null) {
|
|
||||||
$url->setParam('dir', $this->getParam('dir'));
|
|
||||||
}
|
|
||||||
return $this->redirectNow($url);
|
|
||||||
}
|
|
||||||
|
|
||||||
$query = $this->backend->select()->from('eventHistory', array(
|
$query = $this->backend->select()->from('eventHistory', array(
|
||||||
'host_name',
|
'host_name',
|
||||||
'service_description',
|
'service_description',
|
||||||
@ -601,14 +601,12 @@ class Monitoring_ListController extends Controller
|
|||||||
'host',
|
'host',
|
||||||
'service'
|
'service'
|
||||||
));
|
));
|
||||||
if ($this->getParam('state')) {
|
|
||||||
$query->applyFilter(Filter::expression('state', '=', $this->getParam('state')));
|
$this->applyFilter($query);
|
||||||
}
|
|
||||||
|
|
||||||
$this->setupSortControl(array(
|
$this->setupSortControl(array(
|
||||||
'timestamp' => 'Occurence'
|
'timestamp' => 'Occurence'
|
||||||
));
|
));
|
||||||
$this->filterQuery($query);
|
|
||||||
$this->view->history = $query->paginate();
|
$this->view->history = $query->paginate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,12 +8,6 @@
|
|||||||
<?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>
|
<?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>
|
||||||
<?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
|
<?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
|
||||||
|
|
||||||
<br> <br>
|
|
||||||
<?= $form ?>
|
|
||||||
|
|
||||||
<div class="content">
|
|
||||||
<?= $this->filterEditor ?>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<?php endif ?>
|
<?php endif ?>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user