From 6ecdf9dbb47b68beaf948f8416aa2097eb9e6156 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 3 Mar 2015 22:04:14 +0100 Subject: [PATCH] try to fix item file serializers, fix result json view --- timeside/server/serializers.py | 4 +++- timeside/server/views.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/timeside/server/serializers.py b/timeside/server/serializers.py index 02d60e3..9bb0320 100644 --- a/timeside/server/serializers.py +++ b/timeside/server/serializers.py @@ -23,7 +23,6 @@ import django.db.models from django.contrib.auth.models import User - class SelectionSerializer(serializers.ModelSerializer): class Meta: @@ -33,6 +32,9 @@ class SelectionSerializer(serializers.ModelSerializer): class ItemSerializer(serializers.ModelSerializer): + file = serializers.FileField(max_length=1024, allow_empty_file=True, use_url=True) + hdf5 = serializers.FileField(max_length=1024, allow_empty_file=True, use_url=True) + class Meta: model = Item # fields = ('id', 'title', 'file', 'mime_type', 'author') diff --git a/timeside/server/views.py b/timeside/server/views.py index 640f206..2387fe1 100644 --- a/timeside/server/views.py +++ b/timeside/server/views.py @@ -137,7 +137,8 @@ class ResultAnalyzerView(View): def get(self, request, *args, **kwargs): result = Result.objects.get(pk=kwargs['pk']) container = AnalyzerResultContainer() - return HttpResponse(container.from_hdf5(result.hdf5.path).to_json(), + container.from_hdf5(result.hdf5.path) + return HttpResponse(container.to_json(), content_type='application/json') -- 2.39.5