Module: check_mk
Branch: master
Commit: 02f006107c4e5347da1c89ec06b029c97bfa712e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02f006107c4e53…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Oct 3 11:33:27 2013 +0200
FIX: fix logic of some numeric sorters
---
ChangeLog | 1 +
web/htdocs/views.py | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c1f5e02..5624601 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -429,6 +429,7 @@
* FIX: Folder Tree Snapin: make folder filter also work for remote
folders that do not exist locally
* FIX: correctly display sub-minute check/retry intervals
+ * FIX: fix logic of some numeric sorters
WATO:
* FIX: fix layout of Auxiliary tags table
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 5b69b1b..9f5d4c6 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -2673,8 +2673,11 @@ def declare_1to1_sorter(painter_name, func, col_num = 0, reverse =
False):
multisite_sorters[painter_name] = {
"title" : multisite_painters[painter_name]['title'],
"columns" : multisite_painters[painter_name]['columns'],
- "cmp" : lambda r1, r2:
func(multisite_painters[painter_name]['columns'][col_num],
- reverse and r1 or r2,
- reverse and r2 or r1)
}
+ if not reverse:
+ multisite_sorters[painter_name]["cmp"] = \
+ lambda r1, r2:
func(multisite_painters[painter_name]['columns'][col_num], r1, r2)
+ else:
+ multisite_sorters[painter_name]["cmp"] = \
+ lambda r1, r2:
func(multisite_painters[painter_name]['columns'][col_num], r2, r1)
return painter_name