Only jsonify if not already a string; handles multistage better

src/djanalytics/core/djobject.py

@@ -254,7 +254,6 @@ def get_embed(t, config = None):
         for embed_spec in config:
             print embed_spec
             embeds.append(single_embed(t, **embed_spec))
-        print "Multi"
         return multi_embed(embeds)
     return single_embed(t)
                                 

src/djanalytics/core/views.py

@@ -81,11 +81,10 @@ def handle_query(request, name, **kwargs):
     kwargs.update(request.POST.items())
     kwargs.update(request.GET.items())
     results = query_object.__getattr__(name)(**kwargs)
-    try:
-        results = json.dumps(results)
-    except:
-        pass
-    return HttpResponse(results)
+    if isinstance(results, basestring):
+        return HttpResponse(results)
+    else:
+        return HttpResponse(json.dumps(results))
 
 @receiver(event_received)
 def handle_event(sender, **kwargs):