upstream/icingadb-web
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb-web.git synced 2026-05-28 04:36:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't sort by host/service display_name simultaneously

Browse source 
Simultaneous sorting by `host.display_name` and
`service.display_name` and vice versa prevents the use of the
display_name indexes.

Co-authored-by: Eric Lippmann <eric.lippmann@icinga.com>
This commit is contained in:
Yonas Habteab 2021-11-12 12:20:10 +01:00 committed by Eric Lippmann
parent 208c1b1445
commit 2d19db5ee3
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
application/controllers/CommentsController.php
View file

@ -43,11 +43,11 @@ class CommentsController extends Controller
$sortControl = $this->createSortControl(
$comments,
[
'comment.entry_time desc' => t('Entry Time'),
'host.display_name, service.display_name' => t('Host'),
'service.display_name, host.display_name' => t('Service'),
'comment.author' => t('Author'),
'comment.expire_time desc' => t('Expire Time')
'comment.entry_time desc' => t('Entry Time'),
'host.display_name' => t('Host'),
'service.display_name' => t('Service'),
'comment.author' => t('Author'),
'comment.expire_time desc' => t('Expire Time')
]
);
$viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);

4
application/controllers/DowntimesController.php
View file

@ -45,8 +45,8 @@ class DowntimesController extends Controller
[
'downtime.is_in_effect desc, downtime.start_time desc' => t('Is In Effect'),
'downtime.entry_time' => t('Entry Time'),
'host.display_name, service.display_name' => t('Host'),
'service.display_name, host.display_name' => t('Service'),
'host.display_name' => t('Host'),
'service.display_name' => t('Service'),
'downtime.author' => t('Author'),
'downtime.start_time desc' => t('Start Time'),
'downtime.end_time desc' => t('End Time'),

10
application/controllers/ServicesController.php
View file

@ -61,11 +61,11 @@ class ServicesController extends Controller
$sortControl = $this->createSortControl(
$services,
[
'service.display_name, host.display_name' => t('Name'),
'service.state.severity desc' => t('Severity'),
'service.state.soft_state' => t('Current State'),
'service.state.last_state_change desc' => t('Last State Change'),
'host.display_name, service.display_name' => t('Host')
'service.display_name' => t('Name'),
'service.state.severity 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')
]
);
$viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);