Module: check_mk
Branch: master
Commit: 74d5f8612a837ac1506f0fb1e02b7a4f47153313
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74d5f8612a837a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Feb 6 22:17:39 2013 +0100
Fix links from BI in availability
---
web/htdocs/bi.py | 13 ++++---------
web/plugins/views/availability.py | 2 +-
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py
index 687b001..c2d0af9 100644
--- a/web/htdocs/bi.py
+++ b/web/htdocs/bi.py
@@ -1512,23 +1512,18 @@ def aggr_render_leaf(tree, show_host, bare = False):
# (4) CPU load (show_host == False, service != None)
if show_host or not service:
- host_url = html.makeuri([("view_name", "hoststatus"),
("site", site), ("host", host)])
+ host_url = "view.py?" + htmllib.urlencode_vars([("view_name",
"hoststatus"), ("site", site), ("host", host)])
if service:
- service_url = html.makeuri([("view_name", "service"),
("site", site), ("host", host), ("service", service)])
+ service_url = "view.py?" +
htmllib.urlencode_vars([("view_name", "service"), ("site",
site), ("host", host), ("service", service)])
if show_host:
content += '<a href="%s">%s</a><b
class=bullet>♦</b>' % (host_url, host.replace(" ",
" "))
- if tree[1] and tree[0] != tree[1]:
- addclass = ' class="state assumed"'
- else:
- addclass = ""
-
if not service:
- content += '<a href="%s"%s>%s</a>' % (host_url,
addclass, _("Host status"))
+ content += '<a href="%s">%s</a>' % (host_url,
_("Host status"))
else:
- content += '<a href="%s"%s>%s</a>' % (service_url,
addclass, service.replace(" ", " "))
+ content += '<a href="%s">%s</a>' % (service_url,
service.replace(" ", " "))
if bare:
return content
diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py
index 49bb699..e0bf09d 100644
--- a/web/plugins/views/availability.py
+++ b/web/plugins/views/availability.py
@@ -58,7 +58,7 @@ def render_availability(view, datasource, filterheaders,
display_options,
if not html.has_user_errors():
range, range_title = avoptions["range"]
rows = get_availability_data(datasource, filterheaders, range, only_sites, limit,
timeline)
- what == "service" in datasource["infos"] and
"service" or "host"
+ what = "service" in datasource["infos"] and
"service" or "host"
do_render_availability(rows, what, avoptions, timeline, "")
if 'Z' in display_options: