From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 26 Feb 2014 14:33:46 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~287^2~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0f8ce7d0964159ebef736e2fc8c26edd6f18961d;p=myslice.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

0f8ce7d0964159ebef736e2fc8c26edd6f18961d
diff --cc rest/__init__.py
index 070f07d8,58fec2cb..5d1f58a5
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@@ -81,7 -89,7 +91,7 @@@ def send(request, response, object_prop
              
              response_data['data'].append(d)
           
-         return HttpResponse(json.dumps(response_data), content_type="application/json")
+         return HttpResponse(json.dumps(response_data, cls=DecimalEncoder, default=DateEncoder), content_type="application/json")
  
  def error(request, object_name, object_properties):
 -    return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json")
 +    return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json")