diff --git a/atdb/taskdatabase/serializers.py b/atdb/taskdatabase/serializers.py index a233c9162d7a7db700aeaa479e49ef4994dbb14d..5edb74899ec0fb65a871cec7f0583cec26eb4971 100644 --- a/atdb/taskdatabase/serializers.py +++ b/atdb/taskdatabase/serializers.py @@ -37,7 +37,8 @@ class TaskWriteSerializer(serializers.ModelSerializer): class Meta: model = Task - fields = ('id','task_type','filter','predecessor','successors','joined_input_tasks','joined_output_task', + fields = ('id','task_type','filter','predecessor','successors', + #'joined_input_tasks','joined_output_task', 'project','sas_id','priority','purge_policy','cleanup_policy','resume', 'new_workflow_id','new_workflow_uri','workflow', 'stage_request_id', @@ -92,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', @@ -124,7 +125,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', diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 60080c6d458446f046bb819b2bdc95d08efa9e64..884036f42b1cfc285c5dc9e202d2a5170e75e5ae 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -31,7 +31,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 7 July 2023 + <p class="footer"> Version 10 July 2023 </div> {% include 'taskdatabase/refresh.html' %} diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html b/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html index db661b1f4a332464ecbfcd0040208d521f6e21be..d11ded56e4586fd5699c38adcd6e157364253c41 100644 --- a/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html +++ b/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html @@ -9,6 +9,7 @@ <a href="{% url 'task-details-setstatus' task.pk 'archived' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a> <a href="{% url 'task-details-setstatus' task.pk 'finished' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a> <a href="{% url 'task-details-setstatus' task.pk 'suspended' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> suspended</a> +<a href="{% url 'task-discard-view' task.pk 'discard' 1 %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-trash-alt"></i> Discard</a> <!-- <a href="{% url 'task-details-setstatus' task.pk 'discard' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> discard</a>