[checkmk-commits] 3268 FIX Availability options were invalid after resetting them

Module: check_mk Branch: master Commit: c8ec861ab936bdf125addff046891bb47c843850 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8ec861ab936bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 8 13:15:23 2016 +0100 3268 FIX Availability options were invalid after resetting them In certain work flows the availability options would not be correctly reset on {{Reset to defaults}} but all checkboxes would be unchecked. That e.g. lead to the column {{N/A}} missing. This has been fixed. --- .werks/3268 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/availability.py | 1 - web/plugins/views/availability.py | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/3268 b/.werks/3268 new file mode 100644 index 0000000..c15176e --- /dev/null +++ b/.werks/3268 @@ -0,0 +1,12 @@ +Title: Availability options were invalid after resetting them +Level: 2 +Component: reporting +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457439239 + +In certain work flows the availability options would not be correctly reset +on {{Reset to defaults}} but all checkboxes would be unchecked. That e.g. +lead to the column {{N/A}} missing. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 1f7d894..5881654 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ Reporting & Availability: * 3267 New availability option for reclassifying host state "unreachable"... * 3249 FIX: Fix missing filter for non-OK services when report is called via context button + * 3268 FIX: Availability options were invalid after resetting them... Event Console: * 2999 The contact name is now included in Event Console notifications... diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index e73ca4f..40fb346 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -1487,7 +1487,6 @@ def compute_tree_state(tree, status): # to CRIT because of state grouping, then the WARN column should not be # displayed. def cell_active(sid, avoptions): - #html.debug((sid, "aktiv?")) # Some columns might be unneeded due to state treatment options sg = avoptions["state_grouping"] hsg = avoptions["host_state_grouping"] diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 038f71d..f6bf86d 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -97,7 +97,7 @@ def render_availability_options(what): begin_floating_options("avoptions", is_open) for name, height, show_in_reporting, vs in avoption_entries: render_floating_option(name, height, "avo_", vs, avoptions.get(name)) - end_floating_options(reset_url = html.makeuri([("_reset", "1")], remove_prefix="avo_")) + end_floating_options(reset_url = html.makeuri([("_reset", "1")], remove_prefix="avo_", delvars=["apply", "filled_in"])) html.hidden_fields() html.end_form()