From 833e1776667f252a90c7c3aadfe709f96210fee8 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 17 Aug 2015 14:06:14 +0200 Subject: [PATCH] DataView\Servicedowntime: Adjust how to handle filter columns refs #9029 --- .../Monitoring/DataView/Servicedowntime.php | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php b/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php index 0f14857d4..67664fbc4 100644 --- a/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php +++ b/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php @@ -36,7 +36,7 @@ class Servicedowntime extends DataView /** * {@inheritdoc} */ - public function getFilterColumns() + public function getStaticFilterColumns() { return array( 'host', 'host_alias', @@ -45,17 +45,4 @@ class Servicedowntime extends DataView 'servicegroup', 'servicegroup_alias', 'servicegroup_name' ); } - - /** - * {@inheritdoc} - */ - public function isValidFilterTarget($column) - { - if ($column[0] === '_' - && preg_match('/^_(?:host|service)_/', $column) - ) { - return true; - } - return parent::isValidFilterTarget($column); - } }