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

Merge branch 'add-stageit-link' into 'master'

add link to StageIT

See merge request !315
parents 0683dd45 3c3b5323
No related branches found
No related tags found
1 merge request!315add link to StageIT
Pipeline #54042 passed
atdb/atdb/static/taskdatabase/stager.png

4.63 KiB

...@@ -336,6 +336,16 @@ class Task(models.Model): ...@@ -336,6 +336,16 @@ class Task(models.Model):
return "unknown" return "unknown"
@property
def stageit_url(self):
stage_request_id = self.stage_request_id
if stage_request_id:
stager_api = Configuration.objects.get(key='stager:api').value
url = f"{stager_api}/requests/{self.stage_request_id}/"
return url
else:
return None
# NV: this shows the latest status change, but because it is a derived property it cannot be sorted. # NV: this shows the latest status change, but because it is a derived property it cannot be sorted.
# This functionality was not requested, and to avoid additional requests about 'sort' functionalty # This functionality was not requested, and to avoid additional requests about 'sort' functionalty
# it is currently commented out. Could be of use later though, so I leave it in for now. # it is currently commented out. Could be of use later though, so I leave it in for now.
......
atdb/taskdatabase/static/taskdatabase/stager.png

4.63 KiB

...@@ -41,6 +41,9 @@ ...@@ -41,6 +41,9 @@
<td> <td>
{% include "taskdatabase/failures/retry_buttons.html" %} {% include "taskdatabase/failures/retry_buttons.html" %}
{% if task.stageit_url != None %}
<a href="{{ task.stageit_url }}" class="btn btn-info btn-sm" role="button" target="_blank"><img src="{% static 'taskdatabase/stager.png' %}" height="20" alt=""> StageIT</a>&nbsp;
{% endif %}
<a href="{% url 'task-discard-view' task.pk 'discard' my_tasks.number %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-trash-alt"></i> Discard</a> <a href="{% url 'task-discard-view' task.pk 'discard' my_tasks.number %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-trash-alt"></i> Discard</a>
</td> </td>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </div>
</div> </div>
<p class="footer"> Version 17 July 2023 <p class="footer"> Version 18 July 2023
</div> </div>
{% include 'taskdatabase/refresh.html' %} {% include 'taskdatabase/refresh.html' %}
......
...@@ -65,7 +65,8 @@ ...@@ -65,7 +65,8 @@
<tr><td><b>purge_policy</b></td><td>{{ task.purge_policy }}</td></tr> <tr><td><b>purge_policy</b></td><td>{{ task.purge_policy }}</td></tr>
<tr><td><b>cleanup_policy</b></td><td>{{ task.cleanup_policy }}</td></tr> <tr><td><b>cleanup_policy</b></td><td>{{ task.cleanup_policy }}</td></tr>
<tr><td><b>resume</b></td><td>{{ task.resume }}</td></tr> <tr><td><b>resume</b></td><td>{{ task.resume }}</td></tr>
<tr><td><b>stage_request_id</b></td><td>{{ task.stage_request_id }}</td></tr>
<tr><td><b>stage_request_id</b></td><td><a href="{{ task.stageit_url }}">{{ task.stage_request_id }}</a></td></tr>
<tr><td><b>size_to_process</b></td><td>{{ task.size_to_process|filesizeformat }}</td></tr> <tr><td><b>size_to_process</b></td><td>{{ task.size_to_process|filesizeformat }}</td></tr>
<tr><td><b>size_processed</b></td><td>{{ task.size_processed|filesizeformat }}</td></tr> <tr><td><b>size_processed</b></td><td>{{ task.size_processed|filesizeformat }}</td></tr>
<tr><td><b>total_processing_time</b></td><td>{{ task.total_processing_time }}</td></tr> <tr><td><b>total_processing_time</b></td><td>{{ task.total_processing_time }}</td></tr>
......
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