Module: check_mk
Branch: master
Commit: 9ee71a8cdcf55378096b69e0bd3fac4dbf2a8035
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ee71a8cdcf553…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Mar 15 15:10:47 2013 +0100
Availability: fix broken link in BI services
---
web/htdocs/bi.py | 4 ++--
web/htdocs/htmllib.py | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py
index d8a0809..bdaff62 100644
--- a/web/htdocs/bi.py
+++ b/web/htdocs/bi.py
@@ -1548,10 +1548,10 @@ 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)], filename="view.py")
+ host_url = html.makeuri_contextless([("view_name",
"hoststatus"), ("site", site), ("host", host)],
filename="view.py")
if service:
- service_url = html.makeuri([("view_name", "service"),
("site", site), ("host", host), ("service", service)],
filename="view.py")
+ service_url = html.makeuri_contextless([("view_name",
"service"), ("site", site), ("host", host),
("service", service)], filename="view.py")
if show_host:
content += '<a href="%s">%s</a><b
class=bullet>♦</b>' % (host_url, host.replace(" ",
" "))
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index dc8f8d8..f762f35 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -374,11 +374,13 @@ class html:
def makeactionuri(self, addvars):
return self.makeuri(addvars + [("_transid", self.fresh_transid())])
- def makeuri_contextless(self, vars):
+ def makeuri_contextless(self, vars, filename=None):
+ if not filename:
+ filename = self.req.myfile + ".py"
if vars:
- return self.req.myfile + ".py?" + urlencode_vars(vars)
+ return filename + "?" + urlencode_vars(vars)
else:
- return self.req.myfile + ".py"
+ return filename
def image_button(self, varname, title, cssclass = ''):
if not self.mobile: