Do not permit querying columns with changed collation and a valid alternative

refs #8613
This commit is contained in:
Johannes Meyer 2015-04-08 14:51:04 +02:00
parent 9557585f6a
commit c56c5655bd
2 changed files with 2 additions and 5 deletions

View File

@ -21,7 +21,6 @@ class HostStatus extends DataView
public function getColumns() public function getColumns()
{ {
return array( return array(
'host',
'host_name', 'host_name',
'host_display_name', 'host_display_name',
'host_alias', 'host_alias',
@ -114,7 +113,7 @@ class HostStatus extends DataView
public function getFilterColumns() public function getFilterColumns()
{ {
return array('hostgroup', 'service_problems', 'servicegroup'); return array('host', 'hostgroup', 'service', 'servicegroup');
} }
public function isValidFilterTarget($column) public function isValidFilterTarget($column)

View File

@ -72,7 +72,6 @@ class ServiceStatus extends DataView
'host_action_url', 'host_action_url',
'host_notes_url', 'host_notes_url',
'host_last_comment', 'host_last_comment',
'host',
'host_display_name', 'host_display_name',
'host_alias', 'host_alias',
'host_ipv4', 'host_ipv4',
@ -87,7 +86,6 @@ class ServiceStatus extends DataView
'host_last_time_down', 'host_last_time_down',
'host_last_time_unreachable', 'host_last_time_unreachable',
'host_modified_host_attributes', 'host_modified_host_attributes',
'service',
'service_hard_state', 'service_hard_state',
'service_problem', 'service_problem',
'service_perfdata', 'service_perfdata',
@ -165,7 +163,7 @@ class ServiceStatus extends DataView
public function getFilterColumns() public function getFilterColumns()
{ {
return array('hostgroup', 'servicegroup', 'service_problems'); return array('host', 'hostgroup', 'service', 'service_host', 'servicegroup');
} }
public function isValidFilterTarget($column) public function isValidFilterTarget($column)