projects
/
htsworkflow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1ce4eda
)
use JsonResponse instead of making a json response by hand using HttpResponse
author
Diane Trout
<diane@ghic.org>
Wed, 18 Mar 2015 23:50:34 +0000
(16:50 -0700)
committer
Diane Trout
<diane@ghic.org>
Wed, 18 Mar 2015 23:50:34 +0000
(16:50 -0700)
experiments/experiments.py
patch
|
blob
|
history
diff --git
a/experiments/experiments.py
b/experiments/experiments.py
index 0d2f1e0bba2f0533ed8d9722956cd970a7a28a26..fd8fd4e5c623c4bfc4f63d41f14707cd5d5cc2bd 100644
(file)
--- a/
experiments/experiments.py
+++ b/
experiments/experiments.py
@@
-9,7
+9,7
@@
from django.contrib.auth.decorators import login_required
from django.views.decorators.csrf import csrf_exempt
from django.core.exceptions import ObjectDoesNotExist
from django.core.mail import send_mail, mail_admins
from django.views.decorators.csrf import csrf_exempt
from django.core.exceptions import ObjectDoesNotExist
from django.core.mail import send_mail, mail_admins
-from django.http import HttpResponse, Http404
+from django.http import HttpResponse, Http404
, JsonResponse
from django.conf import settings
from django.utils import timezone
from django.conf import settings
from django.utils import timezone
@@
-85,8
+85,7
@@
def flowcell_json(request, fc_id):
if fc_dict is None:
raise Http404
if fc_dict is None:
raise Http404
- fc_json = json.dumps({'result': fc_dict})
- return HttpResponse(fc_json, content_type = 'application/json')
+ return JsonResponse({'result': fc_dict})
def lanes_for(username=None):
"""
def lanes_for(username=None):
"""
@@
-126,8
+125,7
@@
def lanes_for_json(request, username):
#convert query set to python structure
#convert query set to python structure
- result_json = json.dumps({'result': result})
- return HttpResponse(result_json, content_type='application/json')
+ return JsonResponse({'result': result})
def updStatus(request):
def updStatus(request):