[checkmk-commits] Check_MK Git: check_mk: #1094 FIX sidebar snaping 'Tree of folders': fixed exception

Module: check_mk Branch: master Commit: a85978ded78e5a3b7d8aa6b49fbd65114f85ed97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a85978ded78e5a… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Thu Jul 31 11:51:39 2014 +0200 #1094 FIX sidebar snaping 'Tree of folders': fixed exception --- .werks/1094 | 8 ++++++++ ChangeLog | 3 ++- web/plugins/sidebar/wato.py | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.werks/1094 b/.werks/1094 new file mode 100644 index 0000000..89fc260 --- /dev/null +++ b/.werks/1094 @@ -0,0 +1,8 @@ +Title: sidebar snaping 'Tree of folders': fixed exception +Level: 2 +Component: multisite +Version: 1.2.5i6 +Date: 1406800287 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index fdc2ed6..ae70717 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,8 +3,8 @@ * 0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices * 1065 heartbeat_crm / heartbeat_crm.resources: Rewrote checks / formalized parameters... * 1068 livedump: Added optional check interval (detect staleness) / option to encrypt mails... - * 0189 docsis_channels: Support for Frequency of Downstream Channels for Devices with DOCSIS MIB * 1093 windows agent: performance counter can now be specified by name... + * 0189 docsis_channels: Support for Frequency of Downstream Channels for Devices with DOCSIS MIB * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries @@ -13,6 +13,7 @@ Multisite: * 1066 Implemented Dashboard Designer... * 1067 FIX: Fixed login problem in LDAP connector when no user filter specified... + * 1094 FIX: sidebar snaping 'Tree of folders': fixed exception WATO: * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 81cd6f3..0583eb4 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -215,20 +215,20 @@ def render_wato_foldertree(): selected_topic, selected_target = config.load_user_file("foldertree", (_('Hosts'), 'allhosts')) views.load_views() - topic_views = visuals_by_topic(views.permitted_views()) + topic_views = visuals_by_topic(views.permitted_views().items() + dashboard.permitted_dashboards().items()) topics = [ (t, t) for t, s in topic_views ] html.select("topic", topics, selected_topic, onchange = 'wato_tree_topic_changed(this)') html.write('<span class=left>%s</span>' % _('Topic:')) for topic, view_list in topic_views: targets = [] - for t, title, name in view_list: + for t, title, name, is_view in view_list: if config.visible_views and name not in config.visible_views: continue if config.hidden_views and name in config.hidden_views: continue if t == topic: - if topic == _('Dashboards'): + if not is_view: name = 'dashboard|' + name targets.append((name, title))