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

Troubleshoot disable join

See merge request !312

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',

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' %}

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>&nbsp;
 <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>&nbsp;
 <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>&nbsp;
+<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>&nbsp;