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

tables/Icinga*GroupTable: prepare unification

This commit is contained in:
Thomas Gelf 2016-03-09 20:56:53 +01:00
parent be637551be
commit cb6133ffea
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/tables/IcingaHostGroupTable.php
View File

@ -8,6 +8,7 @@ class IcingaHostGroupTable extends QuickTable
{
protected $searchColumns = array(
'hostgroup',
'display_name'
);
public function getColumns()
@ -28,8 +29,8 @@ class IcingaHostGroupTable extends QuickTable
{
$view = $this->view();
return array(
'hostgroup' => $view->translate('Hostgroup'),
'display_name' => $view->translate('Display Name'),
'hostgroup' => $view->translate('Hostgroup'),
'display_name' => $view->translate('Display Name'),
);
}

1
application/tables/IcingaServiceGroupTable.php
View File

@ -8,6 +8,7 @@ class IcingaServiceGroupTable extends QuickTable
{
protected $searchColumns = array(
'servicegroup',
'display_name'
);
public function getColumns()

11
application/tables/IcingaUserGroupTable.php
View File

@ -8,6 +8,7 @@ class IcingaUserGroupTable extends QuickTable
{
protected $searchColumns = array(
'usergroup',
'display_name'
);
public function getColumns()
@ -16,7 +17,6 @@ class IcingaUserGroupTable extends QuickTable
'id' => 'ug.id',
'usergroup' => 'ug.object_name',
'display_name' => 'ug.display_name',
'zone' => 'z.object_name',
);
}
@ -29,9 +29,8 @@ class IcingaUserGroupTable extends QuickTable
{
$view = $this->view();
return array(
'usergroup' => $view->translate('Usergroup'),
'display_name' => $view->translate('Display Name'),
'zone' => $view->translate('Zone'),
'usergroup' => $view->translate('Usergroup'),
'display_name' => $view->translate('Display Name'),
);
}
@ -41,10 +40,6 @@ class IcingaUserGroupTable extends QuickTable
$query = $db->select()->from(
array('ug' => 'icinga_usergroup'),
array()
)->joinLeft(
array('z' => 'icinga_zone'),
'ug.zone_id = z.id',
array()
);
return $query;