From ac2201c3bc8231a7a39d7b860a587118e288607c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 14 Oct 2013 13:36:59 +0200
Subject: [PATCH] Monitoring/List/Services: Fix select missing columns

refs #4824
---
 .../monitoring/application/views/scripts/list/services.phtml  | 2 +-
 modules/monitoring/library/Monitoring/Controller.php          | 4 +++-
 modules/monitoring/library/Monitoring/Object/Service.php      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index c7fb858c6..7c7e828aa 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -90,7 +90,7 @@ $viewHelper = $this->getHelper('MonitoringState');
               <?php if ($service->service_state): ?>
                 <br />
                 <strong>Attempt:</strong>
-                <?= $service->service_current_check_attempt; ?>/<?= $service->service_max_check_attempts; ?>
+                <?= $service->current_check_attempt; ?>/<?= $service->max_check_attempts; ?>
                 (<?= ($service->service_state_type === '1') ? 'Hard' : 'Soft'; ?>)
               <?php endif; ?>
             </div>
diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index 762cc2a58..543cac446 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -49,7 +49,9 @@ class Controller extends ActionController
             'service_notes_url',
             'service_last_comment',
             'service_active_checks_enabled',
-            'service_passive_checks_enabled'
+            'service_passive_checks_enabled',
+            'current_check_attempt' => 'service_current_check_attempt',
+            'max_check_attempts'    => 'service_max_check_attempts'
         );
         if ($params === null) {
             $query = HostAndServiceStatusView::fromRequest(
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index e4167ed9b..602380dcb 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -60,7 +60,7 @@ class Service extends AbstractObject
             'check_command' => 'service_check_command',
             'perfdata'      => 'service_perfdata',
             'current_check_attempt' => 'service_current_check_attempt',
-            'max_check_attemt' => 'service_max_check_attempts',
+            'max_check_attempts' => 'service_max_check_attempts',
             'state_type' => 'service_state_type',
             'passive_checks_enabled' => 'service_passive_checks_enabled',
             'last_state_change' => 'service_last_state_change',