diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index 3e0c458d03c3f24670f8a64c3eda364269543c2b..b35619c139bba142c579e8d2deaf189ab69a9661 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/atdb/taskdatabase/services/algorithms.py @@ -671,10 +671,11 @@ def construct_inspectionplots(task): try: srm_to_url = Configuration.objects.get(key='dcache:srm_to_url').value except: - srm_to_url = "srm://srm.grid.sara.nl/pnfs/grid.sara.nl/data::https://webdav.grid.surfsara.nl/pnfs/grid.sara.nl/data" + srm_to_url = "srm://srm.grid.sara.nl/pnfs/grid.sara.nl/data/lofar/ops/disk/ldv/::https://webdav.grid.surfsara.nl/" + + # https://webdav.grid.surfsara.nl/pnfs/grid.sara.nl/data/lofar/ops/disk/ldv::https://webdav.grid.surfsara.nl token = str(Configuration.objects.get(key='dcache:token').value) - #token ="23f731bb-0ec4-4401-9176-3393cf2a3da1" #token = "MDAxY2xvY2F0aW9uIE9wdGlvbmFsLmVtcHR5CjAwMThpZGVudGlmaWVyIDhSWm1md3ovCjAwMTVjaWQgaWlkOnJEWm1JL2VGCjAwMmFjaWQgaWQ6NTU1ODI7MzE4NTUsMzQ5ODMsNDM0ODU7bGR2b3BzCjAwMmJjaWQgYmVmb3JlOjIwMjItMDQtMThUMTM6MDc6MzkuNzg2NTU3WgowMDM4Y2lkIHJvb3Q6L3BuZnMvZ3JpZC5zYXJhLm5sL2RhdGEvbG9mYXIvb3BzL2Rpc2svbGR2CjAwMWZjaWQgYWN0aXZpdHk6RE9XTkxPQUQsTElTVAowMDE1Y2lkIGlwOjAuMC4wLjAvMAowMDJmc2lnbmF0dXJlIMlsLlm43VRA-uDXqAWTlS2A9HeYnSiUA2jFvKi7DwchCg" translation = srm_to_url.split("::") diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html index f1baef81a9e02414afdefb66ff614bc7ec9caa74..9f0ea11c5c7421070d82086bd97621b807143290 100644 --- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html +++ b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html @@ -35,12 +35,8 @@ <td>{{value}}</td> {% endfor %} <td> - <a class="btn btn-primary btn-sm" role="button" - href="{% url 'inspection-plots' task.id my_tasks.number %}" - target="_blank"> - <img src="{% static 'taskdatabase/surfsara.jpg' %}" height="20" alt="inspection plots"> - </a> - <a class="open-modal btn btn-secondary btn-sm" + + <a class="open-modal btn btn-primary btn-sm" href="{% url 'inspection-plots' task.id my_tasks.number %}" data-popup-url="{% url 'inspection-plots' task.id my_tasks.number %}"> <img src="{% static 'taskdatabase/surfsara.jpg' %}" height="20" alt="inspection plots">