From 0b937c86dc6e4956857cc2e812c72cf50976960a Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 18:00:47 +0200
Subject: [PATCH] Get columns for FilterEditor::setSearchColumns() from
 DataView::getSearchColumns()

refs #8241
---
 .../controllers/ListController.php            | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 01e2adc44..59fcd6f85 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -97,7 +97,7 @@ class Monitoring_ListController extends Controller
             'host_current_check_attempt',
             'host_max_check_attempts'
         ), $this->addColumns()));
-        $this->filterQuery($query, array('host', 'host_display_name'));
+        $this->filterQuery($query);
         $this->applyRestriction('monitoring/hosts/filter', $query);
         $this->view->hosts = $query;
 
@@ -181,7 +181,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, array('service', 'service_display_name'));
+        $this->filterQuery($query);
         $this->applyRestriction('monitoring/services/filter', $query);
         $this->view->services = $query;
 
@@ -499,7 +499,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, array('servicegroup', 'servicegroup_alias'));
+        $this->filterQuery($query);
         $this->view->servicegroups = $query;
 
         $this->setupLimitControl();
@@ -556,7 +556,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, array('hostgroup', 'hostgroup_alias'));
+        $this->filterQuery($query);
         $this->view->hostgroups = $query;
 
         $this->setupLimitControl();
@@ -631,11 +631,10 @@ class Monitoring_ListController extends Controller
      * Apply filters on a DataView
      *
      * @param DataView  $dataView       The DataView to apply filters on
-     * @param array     $searchColumns  Columns to search in
      *
      * @return DataView $dataView
      */
-    protected function filterQuery(DataView $dataView, array $searchColumns = null)
+    protected function filterQuery(DataView $dataView)
     {
         $editor = Widget::create('filterEditor')
             ->setQuery($dataView)
@@ -643,11 +642,9 @@ class Monitoring_ListController extends Controller
                 'limit', 'sort', 'dir', 'format', 'view', 'backend',
                 'stateType', 'addColumns', '_dev'
             )
-            ->ignoreParams('page');
-        if ($searchColumns !== null) {
-            $editor->setSearchColumns($searchColumns);
-        }
-        $editor->handleRequest($this->getRequest());
+            ->ignoreParams('page')
+            ->setSearchColumns($dataView->getSearchColumns())
+            ->handleRequest($this->getRequest());
         $dataView->applyFilter($editor->getFilter());
 
         $this->setupFilterControl($editor);