From 10239f300d04a8e8e20f3a02d559988c335a175a Mon Sep 17 00:00:00 2001
From: Vermaas <vermaas@astron.nl>
Date: Thu, 4 May 2023 09:18:58 +0200
Subject: [PATCH] add a little more info on workflow __str__ (for admin app)
---
atdb/logs/atdb.log | 20 +++++++++++++++++++
atdb/taskdatabase/models.py | 2 +-
.../templates/taskdatabase/index.html | 2 +-
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/atdb/logs/atdb.log b/atdb/logs/atdb.log
index cc8e195e..87f2820e 100644
--- a/atdb/logs/atdb.log
+++ b/atdb/logs/atdb.log
@@ -22,3 +22,23 @@ logging[14/Apr/2023 14:17:24,827] unsupported operand type(s) for +=: 'NoneType'
[01/May/2023 17:07:47,382] task 25485 - (regular) - 146233 has no plots, skipped.
[01/May/2023 17:07:48,568] unsupported operand type(s) for &: 'bool' and 'str'
[01/May/2023 17:07:48,569] task 25485 - (regular) - 146233 has no plots, skipped.
+[01/May/2023 17:07:12,510] unsupported operand type(s) for &: 'bool' and 'str'
+[01/May/2023 17:07:12,512] task 25485 - (regular) - 146233 has no plots, skipped.
+[01/May/2023 17:07:17,635] unsupported operand type(s) for &: 'bool' and 'str'
+[01/May/2023 17:07:17,635] task 25485 - (regular) - 146233 has no plots, skipped.
+[01/May/2023 17:07:28,708] unsupported operand type(s) for &: 'bool' and 'str'
+[01/May/2023 17:07:28,709] unsupported operand type(s) for &: 'bool' and 'str'
+[01/May/2023 17:07:28,709] unsupported operand type(s) for &: 'bool' and 'str'
+[01/May/2023 17:07:28,718] task 25485 - (regular) - 146233 has no plots, skipped.
+[01/May/2023 17:07:28,718] task 25485 - (regular) - 146233 has no plots, skipped.
+[01/May/2023 17:07:28,718] task 25484 - (regular) - 146232 has no plots, skipped.
+[01/May/2023 17:07:29,725] unsupported operand type(s) for &: 'bool' and 'str'
+[01/May/2023 17:07:29,725] task 25484 - (regular) - 146232 has no plots, skipped.
+[01/May/2023 17:07:30,279] unsupported operand type(s) for &: 'bool' and 'str'
+[01/May/2023 17:07:30,279] task 25484 - (regular) - 146232 has no plots, skipped.
+[01/May/2023 17:07:30,718] unsupported operand type(s) for &: 'bool' and 'str'
+[01/May/2023 17:07:30,718] task 25484 - (regular) - 146232 has no plots, skipped.
+[01/May/2023 17:07:47,382] unsupported operand type(s) for &: 'bool' and 'str'
+[01/May/2023 17:07:47,382] task 25485 - (regular) - 146233 has no plots, skipped.
+[01/May/2023 17:07:48,568] unsupported operand type(s) for &: 'bool' and 'str'
+[01/May/2023 17:07:48,569] task 25485 - (regular) - 146233 has no plots, skipped.
diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index 4c066130..6fb37f4f 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -25,7 +25,7 @@ class Workflow(models.Model):
prefetch = models.BooleanField(null=True, default=True)
def __str__(self):
- return str(self.id)
+ return str(self.id) + '-' + str(self.workflow_uri)
# convert the quality information from the JSONfield into a easy parsable list for the template
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 053b0544..a1bf1e87 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -34,7 +34,7 @@
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
- <p class="footer"> Version 1 May 2023
+ <p class="footer"> Version 4 May 2023
</div>
--
GitLab