Module: check_mk
Branch: master
Commit: a09897b59ad2285d68f1b0ac7699b3d8bbc79ca7
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a09897b59ad228…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Oct 24 16:01:03 2014 +0200
Fixed exception when using RelativeDate valuespec
---
web/htdocs/valuespec.py | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py
index 7e42253..4acb5ab 100644
--- a/web/htdocs/valuespec.py
+++ b/web/htdocs/valuespec.py
@@ -1694,23 +1694,28 @@ weekdays = {
class RelativeDate(OptionalDropdownChoice):
def __init__(self, **kwargs):
- ValueSpec.__init__(self, **kwargs)
- self._choices = [
- (0, _("today")),
- (1, _("tomorrow"))]
+ choices = [
+ (0, _("today")),
+ (1, _("tomorrow"))
+ ]
weekday = time.localtime(today()).tm_wday
for w in range(2, 7):
wd = (weekday + w) % 7
- self._choices.append((w, weekdays[wd]))
+ choices.append((w, weekdays[wd]))
for w in range(0, 7):
wd = (weekday + w) % 7
if w < 2:
title = _(" next week")
else:
title = _(" in %d days") % (w + 7)
- self._choices.append((w + 7, weekdays[wd] + title))
- self._explicit = Integer()
- self._otherlabel = _("in ... days")
+ choices.append((w + 7, weekdays[wd] + title))
+
+ kwargs['choices'] = choices
+ kwargs['explicit'] = Integer()
+ kwargs['otherlabel'] = _("in ... days")
+
+ OptionalDropdownChoice.__init__(self, **kwargs)
+
if "default_days" in kwargs:
self._default_value = kwargs["default_days"] * seconds_per_day +
today()
else: