From d5d3f5548f8c29b72ad0104d6b42dbfc3adbed6f Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 24 Jun 2014 21:12:55 +0200 Subject: [PATCH] monitoring/list/hosts: support addcolumns parameter At least it doesn't fail right now, this only works for services so far. View script still needs to be adjusted, will probably be done with #6541. --- modules/monitoring/application/controllers/ListController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index f16bd40fe..8379aaab3 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -60,7 +60,7 @@ class Monitoring_ListController extends Controller $this->addTitleTab('hosts'); $this->setAutorefreshInterval(10); $this->compactView = 'hosts-compact'; - $query = $this->backend->select()->from('hostStatus', array( + $query = $this->backend->select()->from('hostStatus', array_merge(array( 'host_icon_image', 'host_name', 'host_state', @@ -82,7 +82,7 @@ class Monitoring_ListController extends Controller 'host_passive_checks_enabled', 'host_current_check_attempt', 'host_max_check_attempts' - )); + ), $this->extraColumns())); $this->applyFilters($query);