[checkmk-commits] 4040 Fix error in view about "No WATO folder ..." in case of host imported via cmcdump

Module: check_mk Branch: master Commit: a776d02d1b0c98cbbd5a92b8fe54acf02bda04e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a776d02d1b0c98… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri Nov 4 11:32:34 2016 +0100 4040 Fix error in view about "No WATO folder ..." in case of host imported via cmcdump --- .werks/4040 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/wato.py | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/4040 b/.werks/4040 new file mode 100644 index 0000000..7627639 --- /dev/null +++ b/.werks/4040 @@ -0,0 +1,11 @@ +Title: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i2 +Date: 1478255430 +Class: fix + +If you import a host with <tt>cmcdump</tt> and that host has a folder that is not +present on the central system then a red error message was printed and the layout +of the view was broken. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 2c6e35f..39a5f8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 4037 FIX: Fix graphs that have optional metrics... * 3973 FIX: Backup: Fixed displaying wrong finish time after backup completion * 3974 FIX: Sorting comments in hover menu of comments icon by time now + * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index 16c6eb2..7b1316a 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -39,7 +39,11 @@ def get_wato_folder(row, how, with_links = True): if not filename.startswith("/wato/") or not filename.endswith("/hosts.mk"): return "" wato_path = filename[6:-9] - title_path = wato.get_folder_title_path(wato_path, with_links) + try: + title_path = wato.get_folder_title_path(wato_path, with_links) + except Exception, e: + return "%s" % e + if how == "plain": return title_path[-1] elif how == "abs":