DataView\Servicestatus: Adjust how to handle filter columns

refs #9029
This commit is contained in:
Johannes Meyer 2015-08-17 14:06:48 +02:00
parent f0488dddf4
commit fe9c7a613c

View File

@ -6,9 +6,7 @@ namespace Icinga\Module\Monitoring\DataView;
class ServiceStatus extends DataView class ServiceStatus extends DataView
{ {
/** /**
* Retrieve columns provided by this view * {@inheritdoc}
*
* @return array
*/ */
public function getColumns() public function getColumns()
{ {
@ -97,6 +95,9 @@ class ServiceStatus extends DataView
); );
} }
/**
* {@inheritdoc}
*/
public function getSortRules() public function getSortRules()
{ {
return array( return array(
@ -142,7 +143,10 @@ class ServiceStatus extends DataView
); );
} }
public function getFilterColumns() /**
* {@inheritdoc}
*/
public function getStaticFilterColumns()
{ {
return array( return array(
'host', 'host',
@ -157,16 +161,6 @@ class ServiceStatus extends DataView
); );
} }
public function isValidFilterTarget($column)
{
if ($column[0] === '_'
&& preg_match('/^_(?:host|service)_/', $column)
) {
return true;
}
return parent::isValidFilterTarget($column);
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */