Module: check_mk
Branch: master
Commit: d38f7250e51b7cd1542091fc0104a3199c6cfa76
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d38f7250e51b7c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Jul 12 15:51:51 2012 +0200
FIX: fix bug in Age ValueSpec (days were ignored)
---
ChangeLog | 3 +++
web/htdocs/valuespec.py | 9 +++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 61dc906..0272e55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
Livecheck:
* FIX: Compile livecheck also if diet libc is missing
+ Multisite:
+ * FIX: fix bug in Age ValueSpec: days had been ignored
+
1.2.0p2:
Core:
* simulation_mode: legacy_checks, custom_checks and active_checks
diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py
index 511ebcb..0de2dc7 100644
--- a/web/htdocs/valuespec.py
+++ b/web/htdocs/valuespec.py
@@ -144,7 +144,7 @@ class Age(ValueSpec):
html.write("<div>")
html.number_input(varprefix+'_days', days, 2)
html.write(" %s " % _("days"))
- html.number_input(varprefix+'_hour', hours, 2)
+ html.number_input(varprefix+'_hours', hours, 2)
html.write(" %s " % _("hours"))
html.number_input(varprefix+'_minutes', minutes, 2)
html.write(" %s " % _("min"))
@@ -153,7 +153,12 @@ class Age(ValueSpec):
html.write("</div>")
def from_html_vars(self, varprefix):
- return (saveint(html.var(varprefix+'_hour'))*3600) +
(saveint(html.var(varprefix+'_minutes'))*60) +
saveint(html.var(varprefix+'_seconds'))
+ return (
+ saveint(html.var(varprefix+'_days')) * 3600 * 24
+ + saveint(html.var(varprefix+'_hours')) * 3600
+ + saveint(html.var(varprefix+'_minutes')) * 60
+ + saveint(html.var(varprefix+'_seconds'))
+ )
def value_to_text(self, value):
days, rest = divmod(value, 60*60*24)