Module: check_mk
Branch: master
Commit: e3f8e7649b65837925a3f98c0962c18664451386
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3f8e7649b6583…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon May 16 17:07:24 2011 +0200
Restructure TimeFilter internally
---
web/plugins/views/filters.py | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py
index ab0c318..3213b94 100644
--- a/web/plugins/views/filters.py
+++ b/web/plugins/views/filters.py
@@ -388,6 +388,21 @@ class FilterTime(Filter):
html.write(" ")
def filter(self, infoname):
+ range = self.get_time_range()
+ if range == None:
+ return ""
+
+ timestamp, negate = range
+ if negate:
+ neg = "!"
+ else:
+ neg = ""
+
+ return "Filter: %s %s>= %d\n" % (self.column, neg, timestamp)
+
+
+ # Extract timerange user has selected from HTML variables
+ def get_time_range(self):
secs = 0
for s, n in self.ranges:
htmlvar = self.name + "_" + n
@@ -400,13 +415,10 @@ class FilterTime(Filter):
if secs > 0:
timestamp = int(time.time()) - secs
- if html.var(self.name, "since") != "since":
- neg = "!"
- else:
- neg = ""
- return "Filter: %s %s>= %d\n" % (self.column, neg, timestamp)
+ neg = html.var(self.name, "since") != "since"
+ return timestamp, neg
else:
- return ""
+ return None
# I'm not sure if this function is useful or ever been called.
# Problem is, that it is not clear wether to use "since" or
"before"