tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 16:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add sort control to hostgroup summary and fix sort rules for the generic group summary

Browse Source 
refs #4185
This commit is contained in:
Eric Lippmann 2013-10-15 15:33:53 +02:00
parent 103a4dbe91
commit a730713c0a
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/monitoring/application/views/scripts/list/hostgroups.phtml
View File

@ -1,4 +1,5 @@
<div data-icinga-component="app/mainDetailGrid"> <div data-icinga-component="app/mainDetailGrid">
<?= $this->sortControl->render($this); ?>
<?= $this->paginationControl($hostgroups, null, null, array('preserve' => $this->preserve)); ?> <?= $this->paginationControl($hostgroups, null, null, array('preserve' => $this->preserve)); ?>
<table class="table table-condensed"> <table class="table table-condensed">
<tbody> <tbody>

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
View File

@ -77,7 +77,7 @@ class GroupsummaryQuery extends AbstractQuery
protected function joinHostgroups() protected function joinHostgroups()
{ {
if (in_array('servicegroup_name', $this->getColumns())){ if (in_array('servicegroup_name', $this->getColumns())) {
return $this->joinServiceHostgroups(); return $this->joinServiceHostgroups();
} else { } else {
return $this->joinHostHostgroups(); return $this->joinHostHostgroups();

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

@ -35,10 +35,14 @@ class Groupsummary extends DataView
public function getSortRules() public function getSortRules()
{ {
if (in_array('servicegroup_name', $this->getQuery()->getColumns())) {
return array( return array(
'servicegroup_name' => array( 'servicegroup_name' => array(
'order' => self::SORT_ASC 'order' => self::SORT_ASC
), )
);
}
return array(
'hostgroup_name' => array( 'hostgroup_name' => array(
'order' => self::SORT_ASC 'order' => self::SORT_ASC
) )