From 2291e73c4c48c96f85b8ceac4270c0c659834a6d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 15 Oct 2013 14:55:01 +0200
Subject: [PATCH] Servicegroup Summary: Add sort control

refs #4185
---
 .../monitoring/application/controllers/ListController.php    | 5 ++++-
 .../application/views/scripts/list/servicegroups.phtml       | 3 ++-
 .../Monitoring/Backend/Ido/Query/ServicestatusQuery.php      | 2 +-
 .../monitoring/library/Monitoring/DataView/Groupsummary.php  | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index d0467f554..5dddd6479 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -330,8 +330,11 @@ class Monitoring_ListController extends MonitoringController
                 'cnt_services_pending'
             )
         )->getQuery();
-        $this->view->servicegroups = $query->paginate();
         $this->handleFormatRequest($query);
+        $this->view->servicegroups = $query->paginate();
+        $this->setupSortControl(array(
+            'servicegroup_name' => 'Servicegroup Name'
+        ));
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 240b864d3..b8f521385 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -1,6 +1,7 @@
 <div data-icinga-component="app/mainDetailGrid">
+    <?= $this->sortControl->render($this); ?>
     <?= $this->paginationControl($servicegroups, null, null, array('preserve' => $this->preserve)); ?>
-    <table class="table table-condensed">
+    <table>
         <tbody>
         <?php foreach($servicegroups as $servicegroup): ?>
             <tr>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 21087346d..bf6459eb9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -43,7 +43,7 @@ class ServicestatusQuery extends AbstractQuery
         ),
         'servicegroups' => array(
             'servicegroups' => 'sgo.name1',
-        ),
+        )
     );
 
     protected function getDefaultColumns()
diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
index ecae925e3..fa88b7377 100644
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
@@ -37,10 +37,10 @@ class Groupsummary extends DataView
     {
         return array(
             'servicegroup_name' => array(
-                'order' => self::SORT_DESC
+                'order' => self::SORT_ASC
             ),
             'hostgroup_name' => array(
-                'order' => self::SORT_DESC
+                'order' => self::SORT_ASC
             )
         );
     }