From 5ce6123da13b78db0f83fe40cb9695241dfbbae9 Mon Sep 17 00:00:00 2001
From: Vermaas <vermaas@astron.nl>
Date: Tue, 20 Feb 2024 14:41:50 +0100
Subject: [PATCH] potential bugfix when task is created without existing
workflow (unlikely)
---
atdb/taskdatabase/models.py | 1 -
atdb/taskdatabase/services/activities_handler.py | 10 +++++++---
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index 51f56a7f..8d9f1100 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -88,7 +88,6 @@ def associate_task_with_activity(task):
activity = Activity(sas_id=task.sas_id,
project=task.project,
- workflow_id = task.workflow.id,
filter=task.filter)
activity.save()
diff --git a/atdb/taskdatabase/services/activities_handler.py b/atdb/taskdatabase/services/activities_handler.py
index 1f215340..086542dd 100644
--- a/atdb/taskdatabase/services/activities_handler.py
+++ b/atdb/taskdatabase/services/activities_handler.py
@@ -143,6 +143,10 @@ def update_activity(task):
activity.filter = task.filter
activity.save()
- if activity.workflow_id != task.workflow.id:
- activity.workflow_id = task.workflow.id
- activity.save()
\ No newline at end of file
+ try:
+ if activity.workflow_id != task.workflow.id:
+ activity.workflow_id = task.workflow.id
+ activity.save()
+ except:
+ # continue, workflow is not initially needed
+ logger.error(f'no workflow found for this task')
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index d9a8482a..fc4fe7f3 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 19 Feb 2024
+ <p class="footer"> Version 20 Feb 2024
</div>
{% include 'taskdatabase/refresh.html' %}
--
GitLab