try to fix item file serializers, fix result json view

diff --git a/timeside/server/serializers.py b/timeside/server/serializers.py
index 02d60e37ff34c72afeeb796297367305f5a5f0bf..9bb032039bcc787a52f057acd6a4db539b452e24 100644 (file)
--- 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 640f206aaf7a2e76bcc495e364eda03d2396d53e..2387fe1285933b4c0df59df9af9bccf578d5f893 100644 (file)
--- 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')