Module: check_mk
Branch: master
Commit: 9e521d01f2ea9b49179d8c40a667da2fecbd7edb
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e521d01f2ea9b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Dec 23 10:32:51 2016 +0100
4220 FIX WATO folder filter: improve output of unknown folders
Change-Id: I7344a0f80d58b4ce8e29be389ad5ad983dd12ac4
---
.werks/4220 | 9 +++++++++
ChangeLog | 1 +
web/plugins/views/wato.py | 6 ++++++
3 files changed, 16 insertions(+)
diff --git a/.werks/4220 b/.werks/4220
new file mode 100644
index 0000000..022fba3
--- /dev/null
+++ b/.werks/4220
@@ -0,0 +1,9 @@
+Title: WATO folder filter: improve output of unknown folders
+Level: 1
+Component: multisite
+Compatible: compat
+Version: 1.4.0i4
+Date: 1482485555
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 2b44839..970db7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@
* 4004 FIX: Fixed exception when viewing availability of BI aggregations...
* 4144 FIX: Sidebar: Bottom of last snapin was not 100% visible
* 4145 FIX: Fixed exception when setting output_format in wrong case
+ * 4220 FIX: WATO folder filter: improve output of unknown folders
WATO:
* 4142 New extended search dialog for rulesets and rules...
diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py
index 7b1316a..4d8f23a 100644
--- a/web/plugins/views/wato.py
+++ b/web/plugins/views/wato.py
@@ -41,6 +41,12 @@ def get_wato_folder(row, how, with_links = True):
wato_path = filename[6:-9]
try:
title_path = wato.get_folder_title_path(wato_path, with_links)
+ except MKGeneralException:
+ # happens when a path can not be resolved using the local WATO.
+ # e.g. when having an independent site with different folder
+ # hierarchy added to the GUI.
+ # Display the raw path rather than the exception text.
+ title_path = wato_path.split("/")
except Exception, e:
return "%s" % e