Module: check_mk Branch: master Commit: 069b7671fe914091fc0c2f412434015e3c71291b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=069b7671fe9140… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 12:27:26 2014 +0100 Display correct year for availability range for last month in january --- .werks/681 | 9 +++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/681 b/.werks/681 new file mode 100644 index 0000000..0988984 --- /dev/null +++ b/.werks/681 @@ -0,0 +1,9 @@ +Title: Display correct year for availability range for last month in january +Level: 1 +Component: reporting +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390562290 + + diff --git a/ChangeLog b/ChangeLog index 24ba9df..51c3ffd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -231,6 +231,7 @@ Reporting & Availability: * 0018 New option for displaying a legend for the colors used in the timeline... * 0338 FIX: Introduce time limit on availability queries... + * 0681 FIX: Display correct year for availability range for last month in january Event Console: * 0301 Handling messages of special syslog format correctly... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 600d13b..43e4ce9 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1868,8 +1868,9 @@ class Timerange(CascadingDropdown): elif rangespec[0] == 'm': # month broken[2] = 1 from_time = time.mktime(broken) + last_year = broken[0] - ((broken[1] == 1) and 1 or 0) titles = month_names[broken[1] - 1] + " " + str(broken[0]), \ - month_names[(broken[1] + 10) % 12] + " " + str(broken[0]) + month_names[(broken[1] + 10) % 12] + " " + str(last_year) elif rangespec[0] == 'y': # year broken[1:3] = [1, 1]