[checkmk-commits] Check_MK Git: check_mk: FIX: remove use of old option defaults.

checkmk_web_uri User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: a176aba0546a3196689c662cf1b1c40c7f7e963c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a176aba0546a31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 10:19:00 2012 +0200 FIX: remove use of old option defaults.checkmk_web_uri --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- web/plugins/icons/builtin.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b8c213..b626626 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Multisite: * FIX: remove refresh button from dashboard. + * FIX: remove use of old option defaults.checkmk_web_uri * New display type 'boxes-omit-root' for BI views * Hostgroup view BI Boxes omits the root level * Finalized layout if view options and commands/filters/painteroptions. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3fa36ab..3ee700c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10419,7 +10419,7 @@ def mode_pattern_editor(phase): master_url = '' if config.is_multisite(): - master_url = '&master_url=' + defaults.checkmk_web_uri + '/' + master_url = '&master_url=' + defaults.url_prefix + 'check_mk/' html.context_button(title, "logwatch.py?host=%s&file=%s%s" % (htmllib.urlencode(hostname), htmllib.urlencode(item), master_url), 'logwatch') diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 3c03b06..df244ef 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -250,7 +250,7 @@ def logwatch_url(sitename, notes_url): master_url = '' if config.is_multisite(): - master_url = '&master_url=' + defaults.checkmk_web_uri + '/' + master_url = '&master_url=' + defaults.url_prefix + 'check_mk/' return site["url_prefix"] + notes_url[i:] + master_url