diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index ed4f337b07..f0eb7e5fa8 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -270,7 +270,7 @@ public function downtimesAction() 'id' => 'downtime_internal_id', 'objecttype' => 'downtime_objecttype', 'comment' => 'downtime_comment', - 'author' => 'downtime_author', + 'author_name' => 'downtime_author_name', 'start' => 'downtime_start', 'scheduled_start' => 'downtime_scheduled_start', 'scheduled_end' => 'downtime_scheduled_end', diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml index 3e15beef4e..2387e9487a 100644 --- a/modules/monitoring/application/views/scripts/list/downtimes.phtml +++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml @@ -64,7 +64,7 @@ use Icinga\Module\Monitoring\Object\Service; link()->host($downtime->host_name, $downtime->host_display_name) ?>
- icon('comment', $this->translate('Comment')); ?> [escape($downtime->author) ?>] escape($downtime->comment) ?> + icon('comment', $this->translate('Comment')); ?> [escape($downtime->author_name) ?>] escape($downtime->comment) ?>
is_flexible): ?> diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml index 23c20e21f5..b30043bdac 100644 --- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml +++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml @@ -58,7 +58,7 @@ foreach ($object->downtimes as $downtime) { ?> - escape($downtime->author); ?> + escape($downtime->author_name); ?> array( - 'downtime_author' => 'sd.author_name', + 'downtime_author_name' => 'sd.author_name', 'author' => 'sd.author_name', 'downtime_comment' => 'sd.comment_data', 'downtime_entry_time' => 'UNIX_TIMESTAMP(sd.entry_time)', diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php index 07123dd4f4..0b2b024911 100644 --- a/modules/monitoring/library/Monitoring/DataView/Downtime.php +++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php @@ -14,7 +14,7 @@ public function getColumns() { return array( 'downtime_objecttype', - 'downtime_author', + 'downtime_author_name', 'author', 'downtime_comment', 'downtime_entry_time', diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php index c33e1be2d5..a653ea6ed5 100644 --- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php +++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php @@ -276,7 +276,7 @@ public function fetchDowntimes() 'id' => 'downtime_internal_id', 'objecttype' => 'downtime_objecttype', 'comment' => 'downtime_comment', - 'author' => 'downtime_author', + 'author_name' => 'downtime_author_name', 'start' => 'downtime_start', 'scheduled_start' => 'downtime_scheduled_start', 'end' => 'downtime_end',