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

monitoring/list: get rid of last DataView traces

This commit is contained in:
Thomas Gelf 2014-09-05 17:38:02 +02:00
parent 4bb065d9bb
commit caab729451
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,6 @@
use Icinga\Module\Monitoring\Controller; use Icinga\Module\Monitoring\Controller;
use Icinga\Module\Monitoring\Backend; use Icinga\Module\Monitoring\Backend;
use Icinga\Module\Monitoring\DataView\DataView;
use Icinga\Web\Url; use Icinga\Web\Url;
use Icinga\Web\Hook; use Icinga\Web\Hook;
use Icinga\Web\Widget\Tabextension\DashboardAction; use Icinga\Web\Widget\Tabextension\DashboardAction;
@ -500,19 +499,19 @@ class Monitoring_ListController extends Controller
{ {
$this->addTitleTab('servicematrix'); $this->addTitleTab('servicematrix');
$this->setAutorefreshInterval(15); $this->setAutorefreshInterval(15);
$dataview = $this->backend->select()->from('serviceStatus', array( $query = $this->backend->select()->from('serviceStatus', array(
'host_name', 'host_name',
'service_description', 'service_description',
'service_state', 'service_state',
'service_output', 'service_output',
'service_handled' 'service_handled'
)); ));
$this->applyFilters($dataview); $this->applyFilters($query);
$this->setupSortControl(array( $this->setupSortControl(array(
'host_name' => 'Hostname', 'host_name' => 'Hostname',
'service_description' => 'Service description' 'service_description' => 'Service description'
)); ));
$pivot = $dataview->pivot('service_description', 'host_name'); $pivot = $query->pivot('service_description', 'host_name');
$this->view->pivot = $pivot; $this->view->pivot = $pivot;
$this->view->horizontalPaginator = $pivot->paginateXAxis(); $this->view->horizontalPaginator = $pivot->paginateXAxis();
$this->view->verticalPaginator = $pivot->paginateYAxis(); $this->view->verticalPaginator = $pivot->paginateYAxis();
@ -572,10 +571,6 @@ class Monitoring_ListController extends Controller
/** /**
* Apply current user's `monitoring/filter' restrictions on the given data view * Apply current user's `monitoring/filter' restrictions on the given data view
*
* @param DataView $dataView
*
* @return DataView
*/ */
protected function applyRestrictions($query) protected function applyRestrictions($query)
{ {