[checkmk-commits] Check_MK Git: check_mk: FIX: Fixed handling of dashboards without title in sidebar view snapi

Module: check_mk Branch: master Commit: f690a3e391540b3826bc27c78eb838036e90f50d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f690a3e391540b… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Wed Apr 17 13:25:33 2013 +0200 FIX: Fixed handling of dashboards without title in sidebar view snapi Conflicts: ChangeLog --- ChangeLog | 3 ++- web/plugins/sidebar/shipped.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6de736..deeb54a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,3 @@ -<<<<<<< HEAD 1.2.3i1: Core: * Agents can send data for other hosts "piggyback". This is being @@ -115,6 +114,8 @@ * FIX: do not remove directories of non-exisant users anymore. This lead to a deletion of users' settings in case of an external authentication (like mod_ldap). + * FIX: Fixed handling of dashboards without title in sidebar view snapin + WATO: * Improved handling of valuespec validations in WATO rule editor. Displaying a warning message when going to throw away the current settings. diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index f9755d4..1efc109 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -76,7 +76,7 @@ def views_by_topic(): if not view["hidden"] and not view.get("mobile")] # Add all the dashboards to the views list - s += [ (_('Dashboards'), d['title'], d_name) + s += [ (_('Dashboards'), d['title'] and d['title'] or d_name, d_name) for d_name, d in dashboard.dashboards.items() ]