Module: check_mk
Branch: master
Commit: 55fdd9c83b97ffa86a8d4cccac33abc159113b8f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55fdd9c83b97ff…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Jun 24 11:15:32 2011 +0200
Fix HTML bugs in permissions pages
---
web/htdocs/page_logwatch.py | 4 +---
web/htdocs/permissions.py | 8 ++------
web/htdocs/views.py | 8 ++------
web/htdocs/weblib.py | 2 +-
4 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/web/htdocs/page_logwatch.py b/web/htdocs/page_logwatch.py
index 41eeef2..ac4c7ad 100644
--- a/web/htdocs/page_logwatch.py
+++ b/web/htdocs/page_logwatch.py
@@ -29,9 +29,7 @@ from lib import *
import views
-def page(h):
- global html
- html = h
+def page():
host = html.var('host')
filename = html.var('file')
diff --git a/web/htdocs/permissions.py b/web/htdocs/permissions.py
index 1c5bb28..a1a4e21 100644
--- a/web/htdocs/permissions.py
+++ b/web/htdocs/permissions.py
@@ -32,9 +32,7 @@ from lib import *
# * Permissions for actions
-def page_view_permissions(h):
- global html
- html = h
+def page_view_permissions():
html.header("My permissions")
html.write("<p>You have the following permissions:</p>")
html.write("<h2>General permissions</h2>\n<ul>")
@@ -53,9 +51,7 @@ def page_view_permissions(h):
html.write("</ul>\n")
html.footer()
-def page_edit_permissions(h):
- global html
- html = h
+def page_edit_permissions():
if not config.may("edit_permissions"):
raise MKAuthException("You are not allowed to edit permissions.")
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 29b2555..238156f 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -723,9 +723,7 @@ def view_edit_column(n, var_prefix, maxnum, allowed, joined = []):
html.write("</td></tr></table>")
html.write("</div>")
-def ajax_get_edit_column(h):
- global html
- html = h
+def ajax_get_edit_column():
if not config.may("edit_views"):
raise MKAuthException("You are not allowed to edit views.")
@@ -1991,9 +1989,7 @@ def get_context_link(user, viewname):
else:
return None
-def ajax_export(h):
- global html
- html = h
+def ajax_export():
load_views()
for name, view in html.available_views.items():
view["owner"] = ''
diff --git a/web/htdocs/weblib.py b/web/htdocs/weblib.py
index b316091..5794541 100644
--- a/web/htdocs/weblib.py
+++ b/web/htdocs/weblib.py
@@ -56,7 +56,7 @@ def set_tree_states(tree, val):
load_tree_states()
treestates[tree] = val
-def ajax_tree_openclose(h):
+def ajax_tree_openclose():
load_tree_states()
tree = html.var("tree")