Skip to content
Snippets Groups Projects
Commit 061650c8 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

Merge branch 'bug-fix-activity-creation' into 'master'

potential bugfix when task is created without existing workflow (unlikely)

See merge request !342
parents b15464d0 5ce6123d
No related branches found
No related tags found
1 merge request!342potential bugfix when task is created without existing workflow (unlikely)
Pipeline #72855 passed
...@@ -88,7 +88,6 @@ def associate_task_with_activity(task): ...@@ -88,7 +88,6 @@ def associate_task_with_activity(task):
activity = Activity(sas_id=task.sas_id, activity = Activity(sas_id=task.sas_id,
project=task.project, project=task.project,
workflow_id = task.workflow.id,
filter=task.filter) filter=task.filter)
activity.save() activity.save()
......
...@@ -143,6 +143,10 @@ def update_activity(task): ...@@ -143,6 +143,10 @@ def update_activity(task):
activity.filter = task.filter activity.filter = task.filter
activity.save() activity.save()
if activity.workflow_id != task.workflow.id: try:
activity.workflow_id = task.workflow.id if activity.workflow_id != task.workflow.id:
activity.save() activity.workflow_id = task.workflow.id
\ No newline at end of file activity.save()
except:
# continue, workflow is not initially needed
logger.error(f'no workflow found for this task')
\ No newline at end of file
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </div>
</div> </div>
<p class="footer"> Version 19 Feb 2024 <p class="footer"> Version 20 Feb 2024
</div> </div>
{% include 'taskdatabase/refresh.html' %} {% include 'taskdatabase/refresh.html' %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment