X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rest%2F__init__.py;h=fe5e2925e22be055e11bc721ef54ae5864c6730a;hb=ed05804919d39c41003f2eac34d90e345cbf6aa6;hp=0f02ccb7ef3930863be582c73c01d0d929ae1c0a;hpb=4a6fd9e9944195beea99aaf437d41b9fbdcd6419;p=myslice.git diff --git a/rest/__init__.py b/rest/__init__.py index 0f02ccb7..fe5e2925 100644 --- a/rest/__init__.py +++ b/rest/__init__.py @@ -6,10 +6,11 @@ from django.shortcuts import render_to_response from unfold.loginrequired import LoginRequiredView from django.http import HttpResponse -from manifold.core.query import Query, AnalyzedQuery +from manifold.core.query import Query from manifoldapi.manifoldapi import execute_query -from string import join +from string import join + import decimal import datetime import json @@ -113,12 +114,8 @@ def dispatch(request, object_type, object_name): if request.path.split('/')[1] == 'rest' : response_data = response - print response return HttpResponse(json.dumps(response_data, cls=DecimalEncoder, default=DateEncoder), content_type="application/json") elif request.path.split('/')[1] == 'table' : - print o.properties - print o.options - print response return render_to_response('table-default.html', {'data' : response, 'properties' : o.properties, 'id' : o.id, 'options' : o.options}) elif request.path.split('/')[1] == 'datatable' : response_data = {} @@ -130,8 +127,6 @@ def dispatch(request, object_type, object_name): d = [] for p in o.properties : d.append(r[p]) - #print d - response_data['data'].append(d) return HttpResponse(json.dumps(response_data, cls=DecimalEncoder, default=DateEncoder), content_type="application/json")