DowntimeQuery: Add _name suffix to the query column `downtime_author'

...to indicate that it's a case-sensitive column. refs #8613
Icinga · Apr 10, 2015 · 1c32d8e · 1c32d8e
1 parent fda261b
commit 1c32d8e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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',