[checkmk-commits] #2438 FIX Manpage icons: fixed manpage links for active checks

Module: check_mk Branch: master Commit: 3df763bf2e88928e8ab201b765144ed958d3da53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3df763bf2e8892… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 23 11:49:21 2015 +0200 #2438 FIX Manpage icons: fixed manpage links for active checks --- .werks/2438 | 9 +++++++++ ChangeLog | 1 + web/plugins/icons/builtin.py | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2438 b/.werks/2438 new file mode 100644 index 0000000..72448bd --- /dev/null +++ b/.werks/2438 @@ -0,0 +1,9 @@ +Title: Manpage icons: fixed manpage links for active checks +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1445593727 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index aab48fd..334dff9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 2686 FIX: Fixed showing graphs for cluster ping services * 2687 FIX: Quicksearch: Improved error handling * 2689 FIX: LDAP: Fixed broken sync when using "Filter Group" in the user sync settings + * 2438 FIX: Manpage icons: fixed manpage links for active checks WATO: * 2666 FIX: Fix search for global configuration variables: ignore case now diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 738a6b4..955a994 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -220,7 +220,10 @@ def paint_manpage_icon(what, row, tags, host_custom_vars): if command.startswith("check_mk-"): check_type = command[9:] elif command.startswith("check_mk_active-"): - check_type = "check_" + command[16:] + check_name = command[16:].split("!")[0] + if check_name == "cmk_inv": + return + check_type = "check_" + check_name else: return urlvars = [("mode", "check_manpage"), ("check_type", check_type)]