Host/Service/Hostgroup/Servicegroup: Use severity as default sort order

Icinga · Jan 9, 2025 · 9b37857 · 9b37857
1 parent 4806939
commit 9b37857
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/application/controllers/HostgroupsController.php b/application/controllers/HostgroupsController.php
@@ -40,7 +40,6 @@ public function indexAction()
         $paginationControl = $this->createPaginationControl($hostgroups);
         $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);
 
-        $defaultSort = null;
         if ($viewModeSwitcher->getViewMode() === 'grid') {
             $hostgroups->without([
                 'services_critical_handled',
@@ -53,10 +52,10 @@ public function indexAction()
                 'services_warning_handled',
                 'services_warning_unhandled',
             ]);
-
-            $defaultSort = ['hosts_severity DESC', 'display_name'];
         }
 
+        $defaultSort = ['hosts_severity DESC', 'display_name'];
+
         $sortControl = $this->createSortControl(
             $hostgroups,
             [

diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php
@@ -50,15 +50,19 @@ public function indexAction()
 
         $limitControl = $this->createLimitControl();
         $paginationControl = $this->createPaginationControl($hosts);
+
+        $defaultSort = 'host.state.severity desc,host.state.last_state_change desc';
         $sortControl = $this->createSortControl(
             $hosts,
             [
                 'host.display_name'                                          => t('Name'),
                 'host.state.severity desc,host.state.last_state_change desc' => t('Severity'),
                 'host.state.soft_state'                                      => t('Current State'),
                 'host.state.last_state_change desc'                          => t('Last State Change')
-            ]
+            ],
+            $defaultSort
         );
+
         $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);
         $columns = $this->createColumnControl($hosts, $viewModeSwitcher);
 

diff --git a/application/controllers/ServicegroupsController.php b/application/controllers/ServicegroupsController.php
@@ -40,10 +40,7 @@ public function indexAction()
         $paginationControl = $this->createPaginationControl($servicegroups);
         $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);
 
-        $defaultSort = null;
-        if ($viewModeSwitcher->getViewMode() === 'grid') {
-            $defaultSort = ['services_severity DESC', 'display_name'];
-        }
+        $defaultSort = ['services_severity DESC', 'display_name'];
 
         $sortControl = $this->createSortControl(
             $servicegroups,

diff --git a/application/controllers/ServicesController.php b/application/controllers/ServicesController.php
@@ -60,6 +60,8 @@ public function indexAction()
 
         $limitControl = $this->createLimitControl();
         $paginationControl = $this->createPaginationControl($services);
+
+        $defaultSort = 'service.state.severity desc,service.state.last_state_change desc';
         $sortControl = $this->createSortControl(
             $services,
             [
@@ -68,8 +70,10 @@ public function indexAction()
                 'service.state.soft_state'                                         => t('Current State'),
                 'service.state.last_state_change desc'                             => t('Last State Change'),
                 'host.display_name'                                                => t('Host')
-            ]
+            ],
+            $defaultSort
         );
+
         $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);
         $columns = $this->createColumnControl($services, $viewModeSwitcher);