Merge lp:~halkeye/graphite/graphite into lp:~graphite-dev/graphite/main

[Gavin]

add callback=? cgi variable to the usergraph tree so dashboards on a different domain can get pre-created graphs.

[Michael Leinartas (mleinartas)]

This looks good, however I saw this merge request too late (sorry) and already merged in basically the same thing in r745 - sorry about that. The difference is that the parameter is called 'jsonp' rather than 'callback', however it works the same way.

r745 didn't have the /graphlot endpoint done as you did so I'm going to make the change to it as you have as well.

Thanks for the contribution

review: Approve

=== modified file 'webapp/graphite/browser/views.py'
--- webapp/graphite/browser/views.py	2011-12-05 06:12:33 +0000
+++ webapp/graphite/browser/views.py	2012-04-11 00:05:21 +0000
@@ -150,7 +150,11 @@
     no_graphs.update(leafNode)
     nodes.append(no_graphs)
 
-  return json_response(nodes)
+  try:
+    jsonp = request.GET['callback']
+  except:
+    jsonp = ""
+  return json_response(nodes, jsonp)
 
 def userGraphLookup(request):
   "View for User Graphs navigation"
@@ -241,12 +245,18 @@
     no_graphs.update(leafNode)
     nodes.append(no_graphs)
 
-  return json_response(nodes)
-
-
-def json_response(nodes):
+  try:
+    jsonp = request.GET['callback']
+  except:
+    jsonp = ""
+  return json_response(nodes, jsonp)
+
+
+def json_response(nodes, jsonp):
   #json = str(nodes) #poor man's json encoder for simple types
   json_data = json.dumps(nodes)
+  if (jsonp):
+    json_data = jsonp + '(' + json_data + ');'
   response = HttpResponse(json_data,mimetype="application/json")
   response['Pragma'] = 'no-cache'
   response['Cache-Control'] = 'no-cache'
 
=== modified file 'webapp/graphite/graphlot/views.py'
--- webapp/graphite/graphlot/views.py	2011-12-05 06:43:23 +0000
+++ webapp/graphite/graphlot/views.py	2012-04-11 00:05:21 +0000
@@ -246,12 +246,18 @@
     no_graphs.update(leafNode)
     nodes.append(no_graphs)
 
-  return json_response(nodes)
-
-
-def json_response(nodes):
+  try:
+    jsonp = request.GET['callback']
+  except:
+    jsonp = ""
+  return json_response(nodes, jsonp)
+
+
+def json_response(nodes, jsonp):
   #json = str(nodes) #poor man's json encoder for simple types
   json_data = json.dumps(nodes)
+  if (jsonp):
+    json_data = jsonp + '(' + json_data + ');'
   response = HttpResponse(json_data,mimetype="application/json")
   response['Pragma'] = 'no-cache'
   response['Cache-Control'] = 'no-cache'