Module: check_mk
Branch: master
Commit: 6b3ab5840627c14925942de7eb048a21b6ec1324
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b3ab5840627c1…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Mar 6 12:50:37 2015 +0100
Conflicts:
ChangeLog
web/htdocs/dashboard.py
---
.werks/2092 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/dashboard.py | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/2092 b/.werks/2092
new file mode 100644
index 0000000..ad3bea3
--- /dev/null
+++ b/.werks/2092
@@ -0,0 +1,10 @@
+Title: Dashboards: Possible to configure an empty custom title
+Level: 1
+Component: multisite
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1425642562
+
+
diff --git a/ChangeLog b/ChangeLog
index e4c66ee..55b0f0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -283,6 +283,7 @@
* 2024 FIX: Views: Fixed problem when filtering views by strings containing
umlauts...
* 2054 FIX: Sidebar snapin "Tree of folders": fixed exception when using
localized default value...
* 2090 FIX: Fixed errors when editing / rendering custom url dashlets in some
cases...
+ * 2092 FIX: Dashboards: Possible to configure an empty custom title
WATO:
* 1760 Added search form to manual checks page
diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py
index 8a5aed9..0f31ad1 100644
--- a/web/htdocs/dashboard.py
+++ b/web/htdocs/dashboard.py
@@ -572,7 +572,7 @@ def render_dashlet(name, board, nr, dashlet, wato_folder,
add_url_vars):
if dashlet_type.get('title_func'):
title = dashlet_type.get('title_func')(dashlet)
title = dashlet.get('title', title)
- if title and dashlet.get('show_title'):
+ if title != None and dashlet.get('show_title'):
url = dashlet.get("title_url", None)
if url:
title = '<a href="%s">%s</a>' % (url,
_u(title))