[checkmk-commits] Check_MK Git: check_mk: #1714 Add support for jsonp export (

next to json and python) Message-ID: &lt;5485c7f8.ou8gFvdxf10RJdsD%mk(a)mathias-kettner.de&gt; User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: bc8fa431110c12662902bbb32bcffdb4bef9f9e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc8fa431110c12… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Dec 8 16:46:55 2014 +0100 #1714 Add support for jsonp export (next to json and python) The web service for exporting data from views now also supports JSONP. This is basically the same as JSON, but everything is wrapped into <tt>parseJSON(</tt>...<tt>)</tt>. You can select this by adding <tt>&output_format=jsonp</tt> to the URL of a Multisite view. --- .werks/1714 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/webservice.py | 12 ++++++++++++ 3 files changed, 24 insertions(+) diff --git a/.werks/1714 b/.werks/1714 new file mode 100644 index 0000000..b0fb92b --- /dev/null +++ b/.werks/1714 @@ -0,0 +1,11 @@ +Title: Add support for jsonp export (next to json and python) +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1418053509 +Class: feature + +The web service for exporting data from views now also supports JSONP. This +is basically the same as JSON, but everything is wrapped into <tt>parseJSON(</tt>...<tt>)</tt>. +You can select this by adding <tt>&output_format=jsonp</tt> to the URL of a Multisite view. diff --git a/ChangeLog b/ChangeLog index e6651da..45bb972 100644 --- a/ChangeLog +++ b/ChangeLog @@ -145,6 +145,7 @@ * 1636 Crash checks now have an icon for viewing and sending a crash dump... * 1700 Enable icon for link to host/service parameters per default now... * 1705 Better styling of dashboard designer + * 1714 Add support for jsonp export (next to json and python)... * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups * 1166 FIX: Also prevting stylesheet update issues during version updates (just like for JS files) * 1481 FIX: Fix broken layout of Host-, Service- and Contactgroup filters diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index c4622df..753c8f1 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -121,6 +121,17 @@ multisite_layouts["json"] = { "hide" : True, } +def render_jsonp(rows, view, group_painters, painters, num_columns, show_checkboxes): + html.write("parseJSON(\n"); + render_json(rows, view, group_painters, painters, num_columns, show_checkboxes) + html.write(");\n"); + +multisite_layouts["jsonp"] = { + "title" : _("JSONP data output"), + "render" : render_jsonp, + "group" : False, + "hide" : True, +} def render_csv(rows, view, group_painters, painters, num_columns, show_checkboxes, export = False): if export: @@ -168,3 +179,4 @@ multisite_layouts["csv"] = { "group" : False, "hide" : True, } +