tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-29 08:44:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Db: enumIcingaObjects should also provide externals

Browse Source
This commit is contained in:
Thomas Gelf 2015-12-02 20:34:34 +01:00
parent b0f98c2d07
commit be4bfbb37d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Director/Db.php
View File

@ -311,7 +311,6 @@ class Db extends DbConnection
public function enumCheckcommands() public function enumCheckcommands()
{ {
$filters = array( $filters = array(
'object_type IN (?)' => array('object', 'external_object'),
'methods_execute IN (?)' => array('PluginCheck', 'IcingaCheck'), 'methods_execute IN (?)' => array('PluginCheck', 'IcingaCheck'),
); );
@ -424,7 +423,10 @@ class Db extends DbConnection
public function enumIcingaObjects($type, $filters = array()) public function enumIcingaObjects($type, $filters = array())
{ {
$filters = array('object_type = ?' => 'object') + $filters; $filters = array(
'object_type IN (?)' => array('object', 'external_object')
) + $filters;
return $this->enum('icinga_' . $type, null, $filters); return $this->enum('icinga_' . $type, null, $filters);
} }