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

Merge branch 'bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241'

Browse Source 
fixes #8241
This commit is contained in:
Alexander A. Klimov 2015-05-19 14:05:33 +02:00
commit 75b004dc42
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ use Icinga\Web\Widget\Tabs;
use Icinga\Data\Filter\Filter; use Icinga\Data\Filter\Filter;
use Icinga\Web\Widget; use Icinga\Web\Widget;
use Icinga\Module\Monitoring\Forms\StatehistoryForm; use Icinga\Module\Monitoring\Forms\StatehistoryForm;
use Icinga\Data\Filterable;
class Monitoring_ListController extends Controller class Monitoring_ListController extends Controller
{ {
@ -95,7 +96,7 @@ class Monitoring_ListController extends Controller
'host_current_check_attempt', 'host_current_check_attempt',
'host_max_check_attempts' 'host_max_check_attempts'
), $this->addColumns())); ), $this->addColumns()));
$this->filterQuery($query); $this->filterQuery($query, array('host', 'host_display_name'));
$this->applyRestriction('monitoring/hosts/filter', $query); $this->applyRestriction('monitoring/hosts/filter', $query);
$this->view->hosts = $query; $this->view->hosts = $query;
@ -179,7 +180,7 @@ class Monitoring_ListController extends Controller
'max_check_attempts' => 'service_max_check_attempts' 'max_check_attempts' => 'service_max_check_attempts'
), $this->addColumns()); ), $this->addColumns());
$query = $this->backend->select()->from('serviceStatus', $columns); $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->applyRestriction('monitoring/services/filter', $query);
$this->view->services = $query; $this->view->services = $query;
@ -497,7 +498,7 @@ class Monitoring_ListController extends Controller
))->order('services_severity')->order('servicegroup_alias'); ))->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 // 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. // service groups. We should separate them.
$this->filterQuery($query); $this->filterQuery($query, array('servicegroup', 'servicegroup_alias'));
$this->view->servicegroups = $query; $this->view->servicegroups = $query;
$this->setupLimitControl(); $this->setupLimitControl();
@ -554,7 +555,7 @@ class Monitoring_ListController extends Controller
))->order('services_severity')->order('hostgroup_alias'); ))->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 // 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. // service groups. We should separate them.
$this->filterQuery($query); $this->filterQuery($query, array('hostgroup', 'hostgroup_alias'));
$this->view->hostgroups = $query; $this->view->hostgroups = $query;
$this->setupLimitControl(); $this->setupLimitControl();
@ -625,7 +626,15 @@ class Monitoring_ListController extends Controller
$this->view->verticalPaginator = $pivot->paginateYAxis(); $this->view->verticalPaginator = $pivot->paginateYAxis();
} }
protected function filterQuery($query) /**
* Apply filters on a query
*
* @param Filterable $query The query to apply filters on
* @param array $searchColumns Columns to search in
*
* @return Filterable $query
*/
protected function filterQuery(Filterable $query, array $searchColumns = null)
{ {
$editor = Widget::create('filterEditor') $editor = Widget::create('filterEditor')
->setQuery($query) ->setQuery($query)
@ -633,8 +642,11 @@ class Monitoring_ListController extends Controller
'limit', 'sort', 'dir', 'format', 'view', 'backend', 'limit', 'sort', 'dir', 'format', 'view', 'backend',
'stateType', 'addColumns', '_dev' 'stateType', 'addColumns', '_dev'
) )
->ignoreParams('page') ->ignoreParams('page');
->handleRequest($this->getRequest()); if ($searchColumns !== null) {
$editor->setSearchColumns($searchColumns);
}
$editor->handleRequest($this->getRequest());
$query->applyFilter($editor->getFilter()); $query->applyFilter($editor->getFilter());
$this->setupFilterControl($editor); $this->setupFilterControl($editor);