[checkmk-commits] 3860 FIX EC condition: Fixed default value of rule id selection

Module: check_mk Branch: master Commit: 7ac4d94098d0b3057c90400f9ae71ae8320c1b69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ac4d94098d0b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 16 11:16:01 2016 +0200 3860 FIX EC condition: Fixed default value of rule id selection --- .werks/3860 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/3860 b/.werks/3860 new file mode 100644 index 0000000..abe8daf --- /dev/null +++ b/.werks/3860 @@ -0,0 +1,10 @@ +Title: EC condition: Fixed default value of rule id selection +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1474017331 + + diff --git a/ChangeLog b/ChangeLog index d6e037c..da65413 100644 --- a/ChangeLog +++ b/ChangeLog @@ -629,6 +629,7 @@ * 3426 FIX: sms: fixed wrong message handling after message was quoted and therefore too long * 3139 FIX: fixed a couple of minor issues in call to notification scripts... * 3146 FIX: notification scripts will now also timeout when sending a bulk notification... + * 3860 FIX: EC condition: Fixed default value of rule id selection BI: * 3271 New option in aggregation for tuning aggregation of downtimes... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c425720..e4cfb42 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7459,6 +7459,12 @@ def event_rule_match_conditions(flavour): def notification_rule_match_conditions(): + def transform_ec_rule_id_match(val): + if isinstance(val, list): + return val + else: + return [val] + return [ ( "match_escalation", Tuple( @@ -7538,7 +7544,7 @@ def notification_rule_match_conditions(): add_label = _("Add Rule ID"), title = _("Rule IDs") ), - forth = lambda x: isinstance(x, list) and x or [x] + forth = transform_ec_rule_id_match, ) ), ( "match_priority",