Module: check_mk
Branch: master
Commit: 91b8d5925e0d04b7c1caf60515c8f47e2d765050
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91b8d5925e0d04…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Feb 25 15:47:02 2011 +0100
Multisite: Tooltips work in group headers now
---
ChangeLog | 1 +
web/htdocs/views.py | 11 ++++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4b37776..38a100e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@
* FIX: Customlinks snapin persists folding states again
* FIX: PNP timerange painter option field takes selected value as default now
* FIX: Fixed perfometer styling in single dataset layouts
+ * FIX: Tooltips work in group headers now
WATO:
* FIX: fix problem with vanishing services on Windows. Affected were services
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 88f30e7..e8c9498 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -868,10 +868,11 @@ def create_view():
for n in range(1, 500):
pname = html.var("group_%d" % n)
viewname = html.var("group_link_%d" % n)
+ tooltip = html.var("group_tooltip_%d" % n)
if pname:
if viewname not in html.available_views:
viewname = None
- group_painternames.append((pname, viewname))
+ group_painternames.append((pname, viewname, tooltip))
painternames = []
# User can set more than max_display_columns. We cannot easily know
@@ -1902,7 +1903,7 @@ def prepare_paint(p, row):
content = link_to_view(content, row, linkview)
# Tooltip
- if tooltip:
+ if content != '' and tooltip:
cla, txt = multisite_painters[tooltip]["paint"](row)
tooltiptext = htmllib.strip_tags(txt)
content = '<span title="%s">%s</span>' %
(tooltiptext, content)
@@ -1957,12 +1958,12 @@ def register_events(row):
# two rows are in the same group or not
def group_value(row, group_painters):
group = []
- for p, l in group_painters:
- groupvalfunc = p.get("groupby")
+ for p in group_painters:
+ groupvalfunc = p[0].get("groupby")
if groupvalfunc:
group.append(groupvalfunc(row))
else:
- for c in p["columns"]:
+ for c in p[0]["columns"]:
group.append(row[c])
return group