tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3781 from mdetrano/bugfix/cant_search_for_output_in_event_history_2266

Browse Source 
Fixes 2266.  Special handling of notification 'output' field.
This commit is contained in:
Johannes Meyer 2019-05-27 08:29:34 +02:00 committed by GitHub
commit 5961f43aa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,8 @@ class HostnotificationQuery extends IdoQuery
{ {
if ($col === 'UNIX_TIMESTAMP(hn.start_time)') { if ($col === 'UNIX_TIMESTAMP(hn.start_time)') {
return 'hn.start_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression)); return 'hn.start_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
} elseif ($col === $this->columnMap['history']['output']) {
return parent::whereToSql('hn.output', $sign, $expression);
} else { } else {
return parent::whereToSql($col, $sign, $expression); return parent::whereToSql($col, $sign, $expression);
} }

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

@ -68,6 +68,8 @@ class ServicenotificationQuery extends IdoQuery
{ {
if ($col === 'UNIX_TIMESTAMP(sn.start_time)') { if ($col === 'UNIX_TIMESTAMP(sn.start_time)') {
return 'sn.start_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression)); return 'sn.start_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
} elseif ($col === $this->columnMap['history']['output']) {
return parent::whereToSql('sn.output', $sign, $expression);
} else { } else {
return parent::whereToSql($col, $sign, $expression); return parent::whereToSql($col, $sign, $expression);
} }