[checkmk-commits] Check_MK Git: check_mk: #1490 FIX Timperiod excludes can now even be configured when creating a timeperiod

Module: check_mk Branch: master Commit: b9a0fe57be145d16184deda33784111116b3d76f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9a0fe57be145d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 6 12:34:08 2014 +0100 #1490 FIX Timperiod excludes can now even be configured when creating a timeperiod Configuring excludes was only possible when editing a timeperiod. --- .werks/1490 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1490 b/.werks/1490 new file mode 100644 index 0000000..2b6e801 --- /dev/null +++ b/.werks/1490 @@ -0,0 +1,10 @@ +Title: Timperiod excludes can now even be configured when creating a timeperiod +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1415273607 + +Configuring excludes was only possible when editing a timeperiod. diff --git a/ChangeLog b/ChangeLog index fcbaae9..55d95d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog * 1489 Added iCalendar import for generating timeperiods e.g. for holidays... * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... + * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... Notifications: * 1168 FIX: HTML mails can now be configured to display graphs among each other... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a1de88a..d7b6a65 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9532,7 +9532,7 @@ def mode_edit_timeperiod(phase): # exclude the current timeperiod (in order to avoid cycles) other_tps = [] for tpname, tp in timeperiods.items(): - if not new and not timeperiod_excludes(timeperiods, tpname, name): + if not timeperiod_excludes(timeperiods, tpname, name): other_tps.append((tpname, tp.get("alias") or name)) vs_excl = ListChoice(choices = other_tps)