From c1d6f7e83bb3fbf871fea7a629cae906a6dd2df9 Mon Sep 17 00:00:00 2001 From: Vermaas <vermaas@astron.nl> Date: Tue, 13 Feb 2024 09:01:32 +0100 Subject: [PATCH] forgot to switch off some new functionality. And removed the '(old)' string from the old functionality. --- .../templates/taskdatabase/archived/tasks.html | 8 +++++--- .../templates/taskdatabase/validation/tasks.html | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html b/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html index b65b2ba4..53433d52 100644 --- a/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html +++ b/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html @@ -54,16 +54,17 @@ <td> <!-- keep the old mechanism in comments to test/evaluate, remove later when it works --> -<!-- + {% if task.sas_id_archived != None %} <a href={{ task.path_to_lta }} target="_blank"> <img src="{% static 'taskdatabase/ldvlogo_small.png' %}" height="20" alt="link to LTA"> - {{ task.sas_id_archived }} (old) + {{ task.sas_id_archived }} </a> {% else %} - {% endif %} ---> + +<!-- new activity mechanism, to enable SDC-1188 {% if task.activity.archive.sas_id_archived != None %} <a href={{ task.path_to_lta }} target="_blank"> <img src="{% static 'taskdatabase/ldvlogo_small.png' %}" height="20" alt="link to LTA"> @@ -72,6 +73,7 @@ {% else %} - {% endif %} +--> </td> <td> diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks.html index 045ee19d..160703f6 100644 --- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks.html +++ b/atdb/taskdatabase/templates/taskdatabase/validation/tasks.html @@ -71,7 +71,7 @@ <!-- keep the old mechanism in comments to test/evaluate, remove later when it works --> - <td class="{{ task.calculated_qualities.per_sasid }}">{{ task.calculated_qualities.per_sasid|default_if_none:"-" }} (old)</td> + <td class="{{ task.calculated_qualities.per_sasid }}">{{ task.calculated_qualities.per_sasid|default_if_none:"-" }}</td> <!-- new activity mechanism, to enable SDC-1188 <td class="{{ task.activity.calculated_quality }}">{{ task.activity.calculated_quality|default_if_none:"-" }}</td> -- GitLab