Module: check_mk
Branch: master
Commit: 5a439ee0cd8d8e0f7dbe8f9c7cb439fcf5523afb
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a439ee0cd8d8e…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Oct 26 12:05:45 2010 +0200
Multisite: fix downtimes grouping
---
web/plugins/views/painters.py | 4 ++--
web/plugins/views/sorters.py | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py
index 1b61662..865921b 100644
--- a/web/plugins/views/painters.py
+++ b/web/plugins/views/painters.py
@@ -1183,8 +1183,8 @@ multisite_painters["downtime_fixed"] = {
multisite_painters["downtime_what"] = {
"title" : "Downtime type (host/service)",
"short" : "Type",
- "columns" : ["service_description"],
- "paint" : lambda row: (None, row["service_description"] and
"Service" or "Host")
+ "columns" : ["is_service"],
+ "paint" : lambda row: (None, row["is_service"] and
"Service" or "Host")
}
multisite_painters["downtime_type"] = {
"title" : "Downtime active or pending",
diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py
index d04f479..9c41fcd 100644
--- a/web/plugins/views/sorters.py
+++ b/web/plugins/views/sorters.py
@@ -136,9 +136,6 @@ def declare_simple_sorter(name, title, column, func):
"cmp" : lambda r1, r2: func(column, r1, r2)
}
-def cmp_empty_first(column, r1, r2):
- return { (True,True):0, (False,False):0, (True,False):-1, (False,True):1}[(not
r1[column], not r2[column])]
-
# name title column
sortfunction
declare_simple_sorter("svcdescr", "Service description",
"service_description", cmp_simple_string)
declare_simple_sorter("svcoutput", "Service plugin output",
"service_plugin_output", cmp_simple_string)
@@ -152,7 +149,7 @@ declare_simple_sorter("comment_author", "Comment
author", "comment_author",
declare_simple_sorter("comment_type", "Comment type",
"comment_type", cmp_simple_number)
# Downtimes
-declare_simple_sorter("downtime_what", "Downtime type
(host/service)", "service_description", cmp_empty_first)
+declare_simple_sorter("downtime_what", "Downtime type
(host/service)", "is_service", cmp_simple_number)
declare_simple_sorter("downtime_start_time", "Downtime start",
"downtime_start_time", cmp_simple_number)
declare_simple_sorter("downtime_end_time", "Downtime end",
"downtime_end_time", cmp_simple_number)
declare_simple_sorter("downtime_entry_time", "Downtime entry time",
"downtime_entry_time", cmp_simple_number)