diff --git a/atdb/taskdatabase/serializers.py b/atdb/taskdatabase/serializers.py index 7b947d59fc752d3f93d5f5ea8263524c6d01c45a..b7aec35769c4465710e5d6033646e403c861a0dd 100644 --- a/atdb/taskdatabase/serializers.py +++ b/atdb/taskdatabase/serializers.py @@ -1,7 +1,6 @@ from rest_framework import serializers from .models import Status, Task, Workflow, LogEntry, Configuration, Job, PostProcessingRule, Monitor, LatestMonitor - class WorkflowSerializer(serializers.ModelSerializer): class Meta: @@ -59,7 +58,6 @@ class TaskWriteSerializer(serializers.ModelSerializer): workflow_uri = self.initial_data['new_workflow_uri'] if workflow_uri: - #workflow_uri = validated_data['new_workflow_uri'] workflow = Workflow.objects.get(workflow_uri=workflow_uri) task.workflow = workflow task.save() @@ -131,7 +129,6 @@ class TaskReadSerializerFast(serializers.ModelSerializer): 'status','new_status','quality', 'inputs','outputs','metrics','archive', 'size_to_process', 'size_processed', 'total_processing_time', - ] read_only_fields = fields diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index 081cb47ae90befefdce6d4aa62448888d66a9003..428662350e76a3896c5e69e9bce65db729f88a6b 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/atdb/taskdatabase/services/algorithms.py @@ -830,7 +830,7 @@ def construct_summary(task): for filename in added: line += '<tr><td colspan="3">' + filename + '<td></tr>' except Exception as error: - print(error) + pass try: deleted = record['deleted'] @@ -838,16 +838,13 @@ def construct_summary(task): line += '<th>Deleted</th>' for filename in deleted: line += '<tr><td colspan="3">' +filename + '<td></tr>' - - except Exception as error: - print(error) + pass results += line - except Exception as error: - print(error) + logger.error(error) totals += '<th>Totals</th><th></th><th></th>' totals += '<tr><td colspan="2"><b>Input size</b></td><td>' + str(total_size_input) + '</td></tr>' diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 27a14e36b2060afc58622205d28af32323aa5b09..f732752c3c9e233ec80401fb66263f7ea9124041 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -1178,7 +1178,7 @@ def TaskDiscardSasId(request, pk, new_status, page=0): else: # a GET means that the form should be presented to be filled in try: - discard_reason = task.remarks['discard_reason'] + discard_reason = task.remarks.get("discard_reason", "") except: discard_reason = ""