[checkmk-commits] Check_MK Git: check_mk: fixed: html.debug bool flag renamed to html. enable_debug

Module: check_mk Branch: master Commit: 410bfe983bc083dee3eab8664d9316f8cf13f0db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=410bfe983bc083… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Fri Jul 5 12:12:06 2013 +0200 fixed: html.debug bool flag renamed to html.enable_debug (collided with html.debug function) --- web/htdocs/html_mod_python.py | 2 +- web/htdocs/htmllib.py | 6 +++--- web/htdocs/index.py | 2 +- web/htdocs/login.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 9c52e3d..f9c4134 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -77,7 +77,7 @@ class html_mod_python(htmllib.html): def top_heading(self, title): if type(self.user) == str: login_text = "<b>%s</b> (%s" % (config.user_id, "+".join(config.user_role_ids)) - if self.debug: + if self.enable_debug: if config.get_language(): login_text += "/%s" % config.get_language() login_text += ')' diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 73fd679..33dfd4b 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -66,7 +66,7 @@ class html: self.keybindings = [] self.keybindings_enabled = True self.io_error = False - self.debug = False + self.enable_debug = False self.help_visible = False RETURN = 13 @@ -728,7 +728,7 @@ class html: self.write("%s</td></tr></table>" % _("<a href=\"http://mathias-kettner.de\"><img src=\"images/mk_logo_small.gif\"/></a>")) self.write("<hr class=header>\n") - if self.debug: + if self.enable_debug: self.write("<div class=urldebug>%s</div>" % self.makeuri([])) def body_start(self, title='', **args): @@ -999,7 +999,7 @@ class html: '<param name="autostart" value="true">\n' '<param name="playcount" value="1">\n' '</object>\n' % (url, url, url)) - if self.debug: + if self.enable_debug: self.write("(playing sound %s)" % url) def apache_user(self): diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 710f620..f3c583a 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -185,7 +185,7 @@ def handler(req, profiling = True): # store results in the request object for later usage. html = html_mod_python(req) - html.debug = config.debug + html.enable_debug = config.debug html.id = {} # create unique ID for this request __builtin__.html = html diff --git a/web/htdocs/login.py b/web/htdocs/login.py index aa06ade..051850f 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -152,7 +152,7 @@ def check_auth(): try: return check_auth_cookie(cookie_name) except Exception, e: - #if html.debug: + #if html.enable_debug: # html.write('Exception occured while checking cookie %s' % cookie_name) # raise #else: