tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DowntimeQuery: Make query column `author' case-insensitive 

refs #8613
This commit is contained in:
Johannes Meyer 2015-04-10 14:24:53 +02:00
parent 1c32d8ebe5
commit 0f0727491e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
View File

@ -14,7 +14,7 @@ class DowntimeQuery extends IdoQuery
protected $columnMap = array( protected $columnMap = array(
'downtime' => array( 'downtime' => array(
'downtime_author_name' => 'sd.author_name', 'downtime_author_name' => 'sd.author_name',
'author' => 'sd.author_name', 'author' => 'sd.author_name COLLATE latin1_general_ci',
'downtime_comment' => 'sd.comment_data', 'downtime_comment' => 'sd.comment_data',
'downtime_entry_time' => 'UNIX_TIMESTAMP(sd.entry_time)', 'downtime_entry_time' => 'UNIX_TIMESTAMP(sd.entry_time)',
'downtime_is_fixed' => 'sd.is_fixed', 'downtime_is_fixed' => 'sd.is_fixed',

6
modules/monitoring/library/Monitoring/DataView/Downtime.php
View File

@ -15,7 +15,6 @@ class Downtime extends DataView
return array( return array(
'downtime_objecttype', 'downtime_objecttype',
'downtime_author_name', 'downtime_author_name',
'author',
'downtime_comment', 'downtime_comment',
'downtime_entry_time', 'downtime_entry_time',
'downtime_is_fixed', 'downtime_is_fixed',
@ -69,4 +68,9 @@ class Downtime extends DataView
) )
); );
} }
public function getFilterColumns()
{
return array('author', 'host', 'service');
}
} }