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

Take display_name into account when searching for host and service names 

refs #8241
This commit is contained in:
Alexander A. Klimov 2015-05-19 13:58:08 +02:00
parent 85dd496d35
commit a2b262eab1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/monitoring/application/controllers/ListController.php
View File

@ -96,7 +96,7 @@ class Monitoring_ListController extends Controller
'host_current_check_attempt',
'host_max_check_attempts'
), $this->addColumns()));
$this->filterQuery($query);
$this->filterQuery($query, array('host', 'host_display_name'));
$this->applyRestriction('monitoring/hosts/filter', $query);
$this->view->hosts = $query;
@ -180,7 +180,7 @@ class Monitoring_ListController extends Controller
'max_check_attempts' => 'service_max_check_attempts'
), $this->addColumns());
$query = $this->backend->select()->from('serviceStatus', $columns);
$this->filterQuery($query);
$this->filterQuery($query, array('service', 'service_display_name'));
$this->applyRestriction('monitoring/services/filter', $query);
$this->view->services = $query;
@ -498,7 +498,7 @@ class Monitoring_ListController extends Controller
))->order('services_severity')->order('servicegroup_alias');
// TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
// service groups. We should separate them.
$this->filterQuery($query);
$this->filterQuery($query, array('servicegroup', 'servicegroup_alias'));
$this->view->servicegroups = $query;
$this->setupLimitControl();
@ -555,7 +555,7 @@ class Monitoring_ListController extends Controller
))->order('services_severity')->order('hostgroup_alias');
// TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
// service groups. We should separate them.
$this->filterQuery($query);
$this->filterQuery($query, array('hostgroup', 'hostgroup_alias'));
$this->view->hostgroups = $query;
$this->setupLimitControl();