Slightly improve serializers.

cvat-ai · Jan 24, 2019 · b1d0867 · b1d0867
1 parent 056e4c4
commit b1d0867
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/cvat/apps/engine/serializers.py b/cvat/apps/engine/serializers.py
@@ -2,12 +2,12 @@
 from cvat.apps.engine.models import Task, Job, Label, AttributeSpec
 from django.contrib.auth.models import User, Group
 
-class AttributeSerializer(serializers.PrimaryKeyRelatedField, serializers.ModelSerializer):
+class AttributeSerializer(serializers.ModelSerializer):
     class Meta:
         model = AttributeSpec
         fields = ('id', 'text')
 
-class LabelSerializer(serializers.PrimaryKeyRelatedField, serializers.ModelSerializer):
+class LabelSerializer(serializers.ModelSerializer):
     attributes = AttributeSerializer(many=True, source='attributespec_set')
     class Meta:
         model = Label
@@ -21,12 +21,12 @@ def create(self, validated_data):
 
         return label
 
-
 class TaskSerializer(serializers.ModelSerializer):
     labels = LabelSerializer(many=True, source='label_set')
+
     class Meta:
         model = Task
-        fields = ('id', 'name', 'size', 'mode', 'owner', 'assignee',
+        fields = ('url', 'id', 'name', 'size', 'mode', 'owner', 'assignee',
             'bug_tracker', 'created_date', 'updated_date', 'overlap',
             'z_order', 'flipped', 'status', 'labels')
         read_only_fields = ('size', 'mode', 'created_date', 'updated_date',
@@ -41,7 +41,7 @@ def create(self, validated_data):
         return task
 
 
-class JobSerializer(serializers.HyperlinkedModelSerializer):
+class JobSerializer(serializers.ModelSerializer):
     task_id = serializers.ReadOnlyField(source="segment.task.id")
     start_frame = serializers.ReadOnlyField(source="segment.start_frame")
     stop_frame = serializers.ReadOnlyField(source="segment.stop_frame")
@@ -52,7 +52,7 @@ class Meta:
             'stop_frame', 'max_shape_id', 'task_id')
         read_only_fields = ('max_shape_id',)
 
-class UserSerializer(serializers.HyperlinkedModelSerializer):
+class UserSerializer(serializers.ModelSerializer):
     groups = serializers.SlugRelatedField(many=True,
         slug_field='name', queryset=Group.objects.all())
 

diff --git a/cvat/apps/engine/urls.py b/cvat/apps/engine/urls.py
@@ -34,18 +34,14 @@
     # GET and PATCH the specific job
     path(REST_API_PREFIX + 'jobs/<int:pk>', views.JobDetail.as_view(),
         name='job-detail'),
-
-
-
-
-
     # GET a list of annotation tasks, POST an annotation task
     path(REST_API_PREFIX + 'tasks/', views.TaskList.as_view(),
         name='task-list'),
     path( # GET, DELETE, PATCH
-        REST_API_PREFIX + 'tasks/<int:pk>',
-        views.TaskDetail.as_view(),
+        REST_API_PREFIX + 'tasks/<int:pk>', views.TaskDetail.as_view(),
         name='task-detail'),
+
+
     path( # GET, DELETE, PATCH, PUT
         REST_API_PREFIX + 'tasks/<int:pk>/annotations/',
         views.dummy_view,