Module: check_mk
Branch: master
Commit: 2ed52f8df294b66f961f7f823e00dbf4407f70a1
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ed52f8df294b6…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Feb 11 11:04:57 2011 +0100
JSON webservice: send painter name, not painter title
---
web/htdocs/views.py | 4 ++++
web/plugins/views/webservice.py | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index e696b8c..055df9c 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -210,6 +210,10 @@ for name, view in multisite_builtin_views.items():
"",
config.roles)
+# Add painter names to painter objects (e.g. for JSON web service)
+for n, p in multisite_painters.items():
+ p["name"] = n
+
max_display_columns = 12
max_sort_columns = 5
diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py
index 53511ea..f4c4cd1 100644
--- a/web/plugins/views/webservice.py
+++ b/web/plugins/views/webservice.py
@@ -11,7 +11,7 @@ multisite_layouts["python-raw"] = {
def render_python(data, view, group_painters, painters, num_columns):
columns, rows = data
html.write("[\n")
- html.write(repr([p[0]["title"] for p in painters]))
+ html.write(repr([p[0]["name"] for p in painters]))
html.write(",\n")
for row in rows:
html.write("[")
@@ -41,7 +41,7 @@ def encode_string_json(s):
def render_json(data, view, group_painters, painters, num_columns):
columns, rows = data
html.write("[\n")
- html.write(repr([p[0]["title"] for p in painters]))
+ html.write(repr([p[0]["name"] for p in painters]))
for row in rows:
html.write(",\n[")
first = True