Module: check_mk
Branch: master
Commit: eec95b75ee88fd2f78860252286e9b2bdd91b61f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eec95b75ee88fd…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu May 24 13:08:56 2012 +0200
FIX: Fixed sorting views by perfdata values which contain float
---
ChangeLog | 1 +
web/plugins/views/sorters.py | 8 +-------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index aa653c7..9a741af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
* FIX: fix repeated stacked refresh when toggling columns
* FIX: disable checkbox button in non-checkboxable layouts
* FIX: fix table layout for views (gaps where missing sometimes)
+ * FIX: Fixed sorting views by perfdata values which contain floats
Mobile:
* FIX: Fixed logtime filter settings in all mobile views
diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py
index 57f00aa..dcab883 100644
--- a/web/plugins/views/sorters.py
+++ b/web/plugins/views/sorters.py
@@ -157,13 +157,7 @@ declare_1to1_sorter("svc_group_memberlist",
cmp_string_list)
declare_1to1_sorter("svc_acknowledged", cmp_simple_number)
def cmp_perfdata_nth_value(r1, r2, n):
- def saveint(s):
- # Change None or empty strings to -1 to make these lines
- # appear below the lines with a value of 0
- if s is None or s == '':
- return -1
- return int(s)
- return cmp(saveint(get_perfdata_nth_value(r1, n)), saveint(get_perfdata_nth_value(r2,
n)))
+ return cmp(savefloat(get_perfdata_nth_value(r1, n)),
savefloat(get_perfdata_nth_value(r2, n)))
multisite_sorters['svc_perf_val01'] = {
"title" : _("Service performance data - value number %02d") %
1,