diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index d2b57d3fb30ac06efa43709bbb6451ba179a1e7f..59d1ccbe37abd80915c9c280c81cb8f49a0912f9 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -224,21 +224,19 @@ class Task(models.Model): except: return None - def lta_object_id(self): - try: - return self.archive['lta_object_id'] - except: - return None + # def lta_object_id(self): + # try: + # return self.archive['lta_object_id'] + # except: + # return None - def url_in_lta(self): + + def path_to_lta(self): try: - lta_url = Configuration.objects.get(key='lta:url').value - url_in_lta = lta_url + "Lofar?project=ALL&mode=query_result_page&" + self.archive['path_in_lta'] - return url_in_lta + return self.archive['path_to_lta'] except: return None - class LogEntry(models.Model): cpu_cycles = models.IntegerField(null=True,blank=True) wall_clock_time = models.IntegerField(null=True,blank=True) diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html b/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html index fa19ee1728bddb9ba294236a5ecdc6ea7d8d64be..77ac321fe4d5a4d37e2e00eb7cf62aea5847ba47 100644 --- a/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html +++ b/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html @@ -39,7 +39,7 @@ </td> <td> {% if task.sas_id_archived != None %} - <a href={{ task.url_in_lta }} target="_blank"> + <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 }} </a> diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 1ccfc2d6b96e300e655e0145cd491e871eef0c2a..96f13e14affe55eb52e921b042cbe3a385647d68 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 16 Januari 2022 - 12:00 + <p class="footer"> Version 19 Januari 2022 - 10:00 </div>