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

IcingaObjectTables: remove filters, fix object_type

Browse Source
This commit is contained in:
Thomas Gelf 2015-12-15 19:01:48 +01:00
parent 7fe6eb2528
commit f6490f8926
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
application/tables/IcingaEndpointTable.php
View File

@ -13,10 +13,11 @@ class IcingaEndpointTable extends IcingaObjectTable
public function getColumns() public function getColumns()
{ {
return array( return array(
'id' => 'e.id', 'id' => 'e.id',
'endpoint' => 'e.object_name', 'endpoint' => 'e.object_name',
'host' => "(CASE WHEN e.host IS NULL THEN NULL ELSE CONCAT(e.host || ':' || COALESCE(e.port, 5665)) END)", 'object_type' => 'e.object_type',
'zone' => 'z.object_name', 'host' => "(CASE WHEN e.host IS NULL THEN NULL ELSE CONCAT(e.host || ':' || COALESCE(e.port, 5665)) END)",
'zone' => 'z.object_name',
); );
} }

2
application/tables/IcingaHostTable.php
View File

@ -76,6 +76,6 @@ class IcingaHostTable extends IcingaObjectTable
public function getBaseQuery() public function getBaseQuery()
{ {
return $this->getUnfilteredQuery()->where('h.object_type = ?', 'object'); return $this->getUnfilteredQuery();
} }
} }

2
application/tables/IcingaServiceTable.php
View File

@ -57,6 +57,6 @@ class IcingaServiceTable extends IcingaObjectTable
public function getBaseQuery() public function getBaseQuery()
{ {
return $this->getUnfilteredQuery()->where('s.object_type = ?', 'object'); return $this->getUnfilteredQuery();
} }
} }

2
application/tables/IcingaUserTable.php
View File

@ -56,6 +56,6 @@ class IcingaUserTable extends IcingaObjectTable
public function getBaseQuery() public function getBaseQuery()
{ {
return $this->getUnfilteredQuery()->where('u.object_type = ?', 'object'); return $this->getUnfilteredQuery();
} }
} }