[checkmk-commits] 3897 FIX Fixed possible exception in raw edition when rendering graphs

Module: check_mk Branch: master Commit: 4f5b19657b0ab324f56db2a95dec65f8cba07a6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f5b19657b0ab3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 11 14:29:26 2016 +0200 3897 FIX Fixed possible exception in raw edition when rendering graphs --- .werks/3897 | 9 +++++++++ ChangeLog | 3 +++ web/plugins/views/painters.py | 6 ++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/3897 b/.werks/3897 new file mode 100644 index 0000000..a2d4c6b --- /dev/null +++ b/.werks/3897 @@ -0,0 +1,9 @@ +Title: Fixed possible exception in raw edition when rendering graphs +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i2 +Date: 1476188863 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a0c28f9..07f17fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,9 @@ * 3936 FIX: chrony: support new params dictionary and rule "State of NTP time synchronisation" * 3649 FIX: Added a workaround for an escaping-related bug in old bash versions... + Multisite: + * 3897 FIX: Fixed possible exception in raw edition when rendering graphs + WATO: * 3915 User access times: New icon when never logged in; New column "last seen" * 3914 FIX: Roles: Aliases are now unique during cloning diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 9ca75c4..ed4cfb4 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -957,8 +957,10 @@ def paint_time_graph(row, cell): def time_graph_params(): - # TODO: for PNP graphs return None - return metrics.vs_graph_render_options() + if metrics.cmk_graphs_possible(row["site"]): + return metrics.vs_graph_render_options() + else: + return None def paint_time_graph_cmk(row, cell, show_timeranges=False):