From 1349f07203c787ef8c9cb836cdabb899e3df5f3b Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 31 Jul 2024 15:47:42 +0200 Subject: [PATCH 1/4] servicegroup: Don't rely on a database's implicit sort order --- application/controllers/ServicegroupController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/controllers/ServicegroupController.php b/application/controllers/ServicegroupController.php index 520f8318d..4e2bd7458 100644 --- a/application/controllers/ServicegroupController.php +++ b/application/controllers/ServicegroupController.php @@ -77,11 +77,11 @@ public function indexAction(): Generator $sortControl = $this->createSortControl( $services, [ - 'service.display_name' => t('Name'), - 'service.state.severity desc,service.state.last_state_change desc' => t('Severity'), - 'service.state.soft_state' => t('Current State'), - 'service.state.last_state_change desc' => t('Last State Change'), - 'host.display_name' => t('Host') + 'service.display_name, host.display_name' => t('Name'), + 'service.state.severity desc,service.state.last_state_change desc' => t('Severity'), + 'service.state.soft_state, service.display_name, host.display_name' => t('Current State'), + 'service.state.last_state_change desc' => t('Last State Change'), + 'host.display_name, service.display_name' => t('Host') ] ); $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl); From 47d359e4b1c1ad9c4c1883ccc151261456015e08 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 31 Jul 2024 15:48:18 +0200 Subject: [PATCH 2/4] services: Don't rely on a database's implicit sort order --- application/controllers/ServicesController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/controllers/ServicesController.php b/application/controllers/ServicesController.php index 04b930561..ea92fadd6 100644 --- a/application/controllers/ServicesController.php +++ b/application/controllers/ServicesController.php @@ -63,11 +63,11 @@ public function indexAction() $sortControl = $this->createSortControl( $services, [ - 'service.display_name' => t('Name'), - 'service.state.severity desc,service.state.last_state_change desc' => t('Severity'), - 'service.state.soft_state' => t('Current State'), - 'service.state.last_state_change desc' => t('Last State Change'), - 'host.display_name' => t('Host') + 'service.display_name, host.display_name' => t('Name'), + 'service.state.severity desc,service.state.last_state_change desc' => t('Severity'), + 'service.state.soft_state, service.display_name, host.display_name' => t('Current State'), + 'service.state.last_state_change desc' => t('Last State Change'), + 'host.display_name, service.display_name' => t('Host') ] ); $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl); From 35983357c286085be2bb11174023b7a247ccd8da Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 1 Apr 2025 16:39:06 +0200 Subject: [PATCH 3/4] hostgroup: Don't rely on a database's implicit sort order --- application/controllers/HostgroupController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/HostgroupController.php b/application/controllers/HostgroupController.php index 5d8b0a678..66fd357f5 100644 --- a/application/controllers/HostgroupController.php +++ b/application/controllers/HostgroupController.php @@ -73,7 +73,7 @@ public function indexAction(): Generator [ '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.soft_state,host.display_name' => t('Current State'), 'host.state.last_state_change desc' => t('Last State Change') ] ); From 5f6350269a71c1d327f42389d1d421383748ac49 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 1 Apr 2025 16:39:22 +0200 Subject: [PATCH 4/4] hosts: Don't rely on a database's implicit sort order --- application/controllers/HostsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php index 226e6db83..e612eaa7b 100644 --- a/application/controllers/HostsController.php +++ b/application/controllers/HostsController.php @@ -55,7 +55,7 @@ public function indexAction() [ '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.soft_state,host.display_name' => t('Current State'), 'host.state.last_state_change desc' => t('Last State Change') ] );