[checkmk-commits] Check_MK Git: check_mk: #1884 FIX Fixed exception in virtual host tree snapin

Module: check_mk Branch: master Commit: 2c2cb7e07a80193ea3ad2a11bcd015117c161ca4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c2cb7e07a8019… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Jan 30 10:50:53 2015 +0100 #1884 FIX Fixed exception in virtual host tree snapin --- .werks/1884 | 10 ++++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/1884 b/.werks/1884 new file mode 100644 index 0000000..2726a0d --- /dev/null +++ b/.werks/1884 @@ -0,0 +1,10 @@ +Title: Fixed exception in virtual host tree snapin +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422611436 + + diff --git a/ChangeLog b/ChangeLog index 7872af5..4b279a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -149,6 +149,7 @@ * 1871 FIX: Site filter is only shown as host related filter now... * 1872 FIX: View editor hides filter selection for object types which have no filter to choose... * 1876 FIX: User sorting of views can now be disabled again + * 1884 FIX: Fixed exception in virtual host tree snapin WATO: * 1760 Added search form to manual checks page diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index d9d10f9..06e90d7 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1497,7 +1497,7 @@ def render_tag_tree(): tree_conf = {"tree": tree_conf, "cwd":{}} # convert from old style - choices = enumerate([v[0] for v in config.virtual_host_trees]) + choices = [ (str(i), v[0]) for i, v in enumerate(config.virtual_host_trees)] html.begin_form("vtree") # Give chance to change one level up, if we are in a subtree @@ -1506,7 +1506,7 @@ def render_tag_tree(): upurl = "javascript:virtual_host_tree_enter(%r)" % "|".join(cwd[:-1]) html.icon_button(upurl, _("Go up one tree level"), "back") - html.select("vtree", choices, tree_conf["tree"], onchange = 'virtual_host_tree_changed(this)') + html.select("vtree", choices, str(tree_conf["tree"]), onchange = 'virtual_host_tree_changed(this)') html.write("<br>") html.end_form() html.final_javascript(virtual_host_tree_js)