From 639686ce25b21e9bfb2af7de47b9ced66f7af619 Mon Sep 17 00:00:00 2001 From: Vermaas <vermaas@astron.nl> Date: Thu, 29 Aug 2024 09:36:17 +0200 Subject: [PATCH] quickfix to handle 'unknown' storage_location --- atdb/taskdatabase/services/activities_handler.py | 4 ++-- atdb/taskdatabase/templates/taskdatabase/index.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/atdb/taskdatabase/services/activities_handler.py b/atdb/taskdatabase/services/activities_handler.py index 8195047a..c1ef9cc6 100644 --- a/atdb/taskdatabase/services/activities_handler.py +++ b/atdb/taskdatabase/services/activities_handler.py @@ -191,8 +191,8 @@ def update_processed_and_aggregate(task): if (task.workflow.aggregation_strategy == AggregationStrategy.COLLECT_H5.value): - # check if there is already a storage_location, if not, add it. - if not activity.storage_location: + # check if there is already a storage_location, if not, add it... unless the value is 'unknown' + if not activity.storage_location or activity.storage_location == 'unknown': # for this aggregation_strategy, the activity storage_location is the workdir of the aggregation task activity.create_storage_location() diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index b4d295e8..d702112a 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 26 Aug 2024 + <p class="footer"> Version 28 Aug 2024 </div> {% include 'taskdatabase/refresh.html' %} -- GitLab