[checkmk-commits] Check_MK Git: check_mk: #1541 FIX Fixed missing form fields for notification method when editing rbn default rule

Module: check_mk Branch: master Commit: d90f14e473dcab6a4314591a4a2ab0300cea8f9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d90f14e473dcab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 08:52:41 2014 +0100 #1541 FIX Fixed missing form fields for notification method when editing rbn default rule --- .bugs/2224 | 7 +++++-- .werks/1541 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 +--- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.bugs/2224 b/.bugs/2224 index e273344..4b15189 100644 --- a/.bugs/2224 +++ b/.bugs/2224 @@ -1,11 +1,14 @@ Title: Options for Email notification not visible when entering rule Component: wato -State: open +Class: bug +State: done Date: 2014-11-17 11:35:35 Targetversion: 1.2.5i1 -Class: bug When you go to the default rule in the RBN then the method is set to HTML Email, but the actual options are not visible. When you switch back and forth between Cancel, then they become visible. Seems to be a bug in the valuespec. + +2014-12-01 08:51:55: changed state open -> done +Fixed. diff --git a/.werks/1541 b/.werks/1541 new file mode 100644 index 0000000..4e55dfb --- /dev/null +++ b/.werks/1541 @@ -0,0 +1,9 @@ +Title: Fixed missing form fields for notification method when editing rbn default rule +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417420318 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 2552865..3ff5882 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ * 1502 FIX: Fixed removing elements from ListOf choices during complain phase * 1505 FIX: Snapshots are now bound to the used monitoring core... * 1540 FIX: Host diagnose page: Some tests were failing randomly + * 1541 FIX: Fixed missing form fields for notification method when editing rbn default rule Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 735a533..b7578a8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9077,7 +9077,6 @@ def mode_notification_rule(phase, profilemode): else: rule = rules[edit_nr] - vs = vs_notification_rule(userid) if phase == "action": @@ -15890,8 +15889,7 @@ def create_sample_config(): 'contact_object' : True, 'description' : 'Notify all contacts of a host/service via HTML email', 'disabled' : False, - 'notify_method' : [], - 'notify_plugin' : 'mail' + 'notify_plugin' : ('mail', {}), }] save_notification_rules(notification_rules)