Merge branch 'troubleshoot-disable-join' into 'master'

fix serializer to accept joined_output_task

See merge request !313

atdb/taskdatabase/serializers.py

@@ -38,7 +38,7 @@ class TaskWriteSerializer(serializers.ModelSerializer):
     class Meta:
         model = Task
         fields = ('id','task_type','filter','predecessor','successors',
-                  #'joined_input_tasks','joined_output_task',
+                  'joined_output_task',
                   'project','sas_id','priority','purge_policy','cleanup_policy','resume',
                   'new_workflow_id','new_workflow_uri','workflow',
                   'stage_request_id',
@@ -93,7 +93,7 @@ class TaskReadSerializer(serializers.ModelSerializer):
         model = Task
         fields = ['id','task_type','creationTime','filter',
                   'predecessor','predecessor_status','successors',
-                  #'joined_input_tasks','joined_output_task','joined_status',
+                  'joined_input_tasks','joined_output_task','joined_status',
                   'project','sas_id','priority','purge_policy','cleanup_policy','resume',
                   'workflow',
                   'stage_request_id',
@@ -105,6 +105,7 @@ class TaskReadSerializer(serializers.ModelSerializer):
         read_only_fields = fields
 
 
+#/atdb/tasks-fast/
 class TaskReadSerializerFast(serializers.ModelSerializer):
     """
     status_history = serializers.StringRelatedField(
@@ -125,7 +126,7 @@ class TaskReadSerializerFast(serializers.ModelSerializer):
     class Meta:
         model = Task
         fields = ['id','task_type','creationTime','filter','predecessor','predecessor_status',
-                  #'joined_input_tasks', 'joined_output_task', 'joined_status'
+                  #'joined_input_tasks', 'joined_output_task', 'joined_status',
                   'project','sas_id','priority','purge_policy','cleanup_policy','resume',
                   'workflow',
                   'stage_request_id',