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

Fix missing comment and downtime name in the object detail views

This commit is contained in:
Eric Lippmann 2016-09-08 15:03:45 +02:00
parent 9402c1ffa6
commit 01bee4641d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/monitoring/library/Monitoring/Object/MonitoredObject.php
View File

@ -332,6 +332,7 @@ abstract class MonitoredObject implements Filterable
'comment' => 'comment_data', 'comment' => 'comment_data',
'expiration' => 'comment_expiration', 'expiration' => 'comment_expiration',
'id' => 'comment_internal_id', 'id' => 'comment_internal_id',
'name' => 'comment_name',
'persistent' => 'comment_is_persistent', 'persistent' => 'comment_is_persistent',
'timestamp' => 'comment_timestamp', 'timestamp' => 'comment_timestamp',
'type' => 'comment_type' 'type' => 'comment_type'
@ -584,19 +585,20 @@ abstract class MonitoredObject implements Filterable
public function fetchDowntimes() public function fetchDowntimes()
{ {
$downtimes = $this->backend->select()->from('downtime', array( $downtimes = $this->backend->select()->from('downtime', array(
'id' => 'downtime_internal_id',
'objecttype' => 'object_type',
'comment' => 'downtime_comment',
'author_name' => 'downtime_author_name', 'author_name' => 'downtime_author_name',
'start' => 'downtime_start', 'comment' => 'downtime_comment',
'scheduled_start' => 'downtime_scheduled_start',
'scheduled_end' => 'downtime_scheduled_end',
'end' => 'downtime_end',
'duration' => 'downtime_duration', 'duration' => 'downtime_duration',
'is_flexible' => 'downtime_is_flexible', 'end' => 'downtime_end',
'entry_time' => 'downtime_entry_time',
'id' => 'downtime_internal_id',
'is_fixed' => 'downtime_is_fixed', 'is_fixed' => 'downtime_is_fixed',
'is_flexible' => 'downtime_is_flexible',
'is_in_effect' => 'downtime_is_in_effect', 'is_in_effect' => 'downtime_is_in_effect',
'entry_time' => 'downtime_entry_time' 'name' => 'downtime_name',
'objecttype' => 'object_type',
'scheduled_end' => 'downtime_scheduled_end',
'scheduled_start' => 'downtime_scheduled_start',
'start' => 'downtime_start'
)) ))
->where('object_type', $this->type) ->where('object_type', $this->type)
->order('downtime_is_in_effect', 'DESC') ->order('downtime_is_in_effect', 'DESC')