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

Groupsummary: remove invalid sort column discovery 

This didn't result in a loop 'til now as it wasn't even used. The problem
here is that the same View is used for tow differend things, this makes no
sense. In the meantime removing that code fixes related problems.
This commit is contained in:
Thomas Gelf 2014-09-03 18:55:20 +02:00
parent 510e38335e
commit 8fdf20fbf2
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/application/controllers/ChartController.php
View File

@ -99,7 +99,7 @@ class Monitoring_ChartController extends Controller
'services_warning_unhandled',
'services_pending'
)
)->getQuery()->fetchAll();
)->order('hostgroup')->getQuery()->fetchAll();
$this->view->height = intval($this->getParam('height', 500));
$this->view->width = intval($this->getParam('width', 500));
if (count($query) === 1) {
@ -124,7 +124,7 @@ class Monitoring_ChartController extends Controller
'services_warning_unhandled',
'services_pending'
)
)->getQuery()->fetchAll();
)->order('servicegroup')->getQuery()->fetchAll();
$this->view->height = intval($this->getParam('height', 500));
$this->view->width = intval($this->getParam('width', 500));

16
modules/monitoring/library/Monitoring/DataView/Groupsummary.php
View File

@ -37,20 +37,4 @@ class Groupsummary extends DataView
'services_pending'
);
}
public function getSortRules()
{
if (in_array('servicegroup', $this->getQuery()->getColumns())) {
return array(
'servicegroup' => array(
'order' => self::SORT_ASC
)
);
}
return array(
'hostgroup' => array(
'order' => self::SORT_ASC
)
);
}
}