[checkmk-commits] #3044 FIX Fixed garbled notifications page on page reload after an action has been performed

Module: check_mk Branch: master Commit: 6b7c667e710cfb13b2cc289f66f940c82a9b7938 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b7c667e710cfb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 3 13:53:25 2016 +0100 #3044 FIX Fixed garbled notifications page on page reload after an action has been performed --- .werks/3044 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 5 ++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.werks/3044 b/.werks/3044 new file mode 100644 index 0000000..46af05f --- /dev/null +++ b/.werks/3044 @@ -0,0 +1,9 @@ +Title: Fixed garbled notifications page on page reload after an action has been performed +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1454503973 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a2ca644..dfc3ca8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -332,6 +332,7 @@ * 2928 FIX: Fix display of rule set Do hardware/software Inventory... * 3036 FIX: Bulk discovery steps are now timing out short before HTTP request timeout... * 3038 FIX: Fixed invalid error message when creating service group assignment rule without having service groups + * 3044 FIX: Fixed garbled notifications page on page reload after an action has been performed Notifications: * 2811 Mail notifications: Now able to add Host/Service Notes Url... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4292824..80b0abb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7722,19 +7722,16 @@ def mode_notifications(phase): if html.check_transaction(): options["show_user_rules"] = not not html.var("_show_user") config.save_user_file("notification_display_options", options) - return elif html.has_var("_show_backlog"): if html.check_transaction(): options["show_backlog"] = not not html.var("_show_backlog") config.save_user_file("notification_display_options", options) - return elif html.has_var("_show_bulks"): if html.check_transaction(): options["show_bulks"] = not not html.var("_show_bulks") config.save_user_file("notification_display_options", options) - return elif html.has_var("_replay"): if html.check_transaction(): @@ -7745,6 +7742,8 @@ def mode_notifications(phase): else: return generic_rule_list_actions(rules, "notification", _("notification rule"), save_notification_rules) + return + # Check setting of global notifications. Are they enabled? If not, display # a warning here. Note: this is a main.mk setting, so we cannot access this