From 1c32d8ebe569d4b00fa11dd5aec3eb5c393b212f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 14:23:05 +0200
Subject: [PATCH] DowntimeQuery: Add _name suffix to the query column
 `downtime_author'

...to indicate that it's a case-sensitive column.

refs #8613
---
 modules/monitoring/application/controllers/ListController.php   | 2 +-
 .../monitoring/application/views/scripts/list/downtimes.phtml   | 2 +-
 .../application/views/scripts/show/components/downtime.phtml    | 2 +-
 .../library/Monitoring/Backend/Ido/Query/DowntimeQuery.php      | 2 +-
 modules/monitoring/library/Monitoring/DataView/Downtime.php     | 2 +-
 .../monitoring/library/Monitoring/Object/MonitoredObject.php    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index ed4f337b0..f0eb7e5fa 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -270,7 +270,7 @@ class Monitoring_ListController extends Controller
             '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 3e15beef4..2387e9487 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;
           <?= $this->link()->host($downtime->host_name, $downtime->host_display_name) ?>
         <?php endif ?>
           <br>
-          <?= $this->icon('comment', $this->translate('Comment')); ?> [<?= $this->escape($downtime->author) ?>] <?= $this->escape($downtime->comment) ?>
+          <?= $this->icon('comment', $this->translate('Comment')); ?> [<?= $this->escape($downtime->author_name) ?>] <?= $this->escape($downtime->comment) ?>
           <br>
           <small>
         <?php if ($downtime->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 23c20e21f..b30043bda 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) {
 
     ?>
     <tr>
-        <th><?= $this->escape($downtime->author); ?></th>
+        <th><?= $this->escape($downtime->author_name); ?></th>
         <td data-base-target="_self">
             <?php if (isset($delDowntimeForm)) { // Form is unset if the current user lacks the respective permission
                 $delDowntimeForm = clone $delDowntimeForm;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index f1981ef7f..a98b8e2c4 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -13,7 +13,7 @@ class DowntimeQuery extends IdoQuery
      */
     protected $columnMap = array(
         'downtime' => 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 07123dd4f..0b2b02491 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -14,7 +14,7 @@ class Downtime extends DataView
     {
         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 c33e1be2d..a653ea6ed 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -276,7 +276,7 @@ abstract class MonitoredObject implements Filterable
             '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',