tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/sorting-no-longer-works-as-expected-11729' 

fixes #11729
This commit is contained in:
Eric Lippmann 2016-06-02 17:53:46 +02:00
parent 6cf8c2ec93 af2cee0942
commit e92aa3de42
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
View File

@ -148,11 +148,6 @@ class HoststatusQuery extends IdoQuery
ELSE 4
END
END
END
+
CASE WHEN hs.state_type = 1
THEN 8
ELSE 0
END',
'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
'host_state_type' => 'hs.state_type',

10
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
View File

@ -131,11 +131,6 @@ class ServicestatusQuery extends IdoQuery
ELSE 4
END
END
END
+
CASE WHEN hs.state_type = 1
THEN 8
ELSE 0
END',
'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
'host_state_type' => 'hs.state_type',
@ -271,11 +266,6 @@ class ServicestatusQuery extends IdoQuery
END
END
END
END
+
CASE WHEN ss.state_type = 1
THEN 8
ELSE 0
END',
'service_state' => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END',
'service_state_type' => 'ss.state_type',