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

IcingaServiceTable: order by whether it has... 

...a command and is therefore candidate for apply rules. Sort by
object name afterwards
This commit is contained in:
Thomas Gelf 2016-03-24 18:50:48 +01:00
parent bd41d9d6a6
commit fe308a3ee6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/tables/IcingaServiceTable.php
View File

@ -105,7 +105,8 @@ class IcingaServiceTable extends QuickTable
array('i' => 'icinga_service_inheritance'), array('i' => 'icinga_service_inheritance'),
'i.service_id = s.id', 'i.service_id = s.id',
array() array()
)->where('i.parent_service_id = ?', $id)->where('s.object_type = ?', 'apply'); )->where('i.parent_service_id = ?', $id)
->where('s.object_type = ?', 'apply');
return $db->fetchPairs($query); return $db->fetchPairs($query);
} }
@ -115,6 +116,7 @@ class IcingaServiceTable extends QuickTable
return $this->getUnfilteredQuery()->where( return $this->getUnfilteredQuery()->where(
's.object_type IN (?)', 's.object_type IN (?)',
array('template') array('template')
); )->order('CASE WHEN s.check_command_id IS NULL THEN 1 ELSE 0 END')
->order('s.object_name');
} }
} }