From 913c024e464b82f0586cdd0d0978f94ddb67893f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 31 Mar 2016 09:59:18 +0200
Subject: [PATCH] monitoring: Use descriptive variable names in
 servicegroupsAction()

---
 .../application/controllers/ListController.php  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 7f5201d07..f6209be15 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -445,6 +445,9 @@ class ListController extends Controller
         }
     }
 
+    /**
+     * List service groups
+     */
     public function servicegroupsAction()
     {
         $this->addTitleTab(
@@ -452,9 +455,10 @@ class ListController extends Controller
             $this->translate('Service Groups'),
             $this->translate('List service groups')
         );
+
         $this->setAutorefreshInterval(12);
 
-        $query = $this->backend->select()->from('servicegroupsummary', array(
+        $serviceGroups = $this->backend->select()->from('servicegroupsummary', array(
             'servicegroup_alias',
             'servicegroup_name',
             'services_critical_handled',
@@ -467,17 +471,18 @@ class ListController extends Controller
             'services_warning_handled',
             'services_warning_unhandled'
         ));
-        $this->applyRestriction('monitoring/filter/objects', $query);
-        $this->filterQuery($query);
-        $this->view->servicegroups = $query;
+        $this->applyRestriction('monitoring/filter/objects', $serviceGroups);
+        $this->filterQuery($serviceGroups);
 
+        $this->setupPaginationControl($serviceGroups);
         $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->servicegroups);
         $this->setupSortControl(array(
             'services_severity'     => $this->translate('Severity'),
             'servicegroup_alias'    => $this->translate('Service Group Name'),
             'services_total'        => $this->translate('Total Services')
-        ), $query);
+        ), $serviceGroups);
+
+        $this->view->serviceGroups = $serviceGroups;
     }
 
     /**