mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

#8366: Add started field to JobResult

Browse Source
This commit is contained in:
jeremystretch
2022-11-15 14:38:58 -05:00
parent 87727c71f7
commit 0bcc59a1e9
15 changed files with 84 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/templates/extras/htmx/report_result.html
View File

@@ -1,9 +1,12 @@
{% load helpers %}
<p>
Initiated: <strong>{{ result.created|annotated_date }}</strong>
{% if result.scheduled %}
{% if result.started %}
Started: <strong>{{ result.started|annotated_date }}</strong>
{% elif result.scheduled %}
Scheduled for: <strong>{{ result.scheduled|annotated_date }}</strong>
{% else %}
Created: <strong>{{ result.created|annotated_date }}</strong>
{% endif %}
{% if result.completed %}
Duration: <strong>{{ result.duration }}</strong>
@@ -71,6 +74,6 @@
</table>
</div>
</div>
{% else %}
{% elif result.started %}
{% include 'extras/inc/result_pending.html' %}
{% endif %}

9
netbox/templates/extras/htmx/script_result.html
View File

@@ -2,9 +2,12 @@
{% load log_levels %}
<p>
Initiated: <strong>{{ result.created|annotated_date }}</strong>
{% if result.scheduled %}
{% if result.started %}
Started: <strong>{{ result.started|annotated_date }}</strong>
{% elif result.scheduled %}
Scheduled for: <strong>{{ result.scheduled|annotated_date }}</strong>
{% else %}
Created: <strong>{{ result.created|annotated_date }}</strong>
{% endif %}
{% if result.completed %}
Duration: <strong>{{ result.duration }}</strong>
@@ -48,6 +51,6 @@
{% else %}
<p class="text-muted">None</p>
{% endif %}
{% else %}
{% elif result.started %}
{% include 'extras/inc/result_pending.html' %}
{% endif %}

2
netbox/templates/extras/report_result.html
View File

@@ -4,7 +4,7 @@
{% block content-wrapper %}
<div class="row p-3">
<div class="col col-md-12"{% if not result.completed %} hx-get="{% url 'extras:report_result' job_result_pk=result.pk %}" hx-trigger="every 3s"{% endif %}>
<div class="col col-md-12"{% if not result.completed %} hx-get="{% url 'extras:report_result' job_result_pk=result.pk %}" hx-trigger="every 5s"{% endif %}>
{% include 'extras/htmx/report_result.html' %}
</div>
</div>

2
netbox/templates/extras/script_result.html
View File

@@ -47,7 +47,7 @@
<div class="tab-content mb-3">
<div role="tabpanel" class="tab-pane active" id="log">
<div class="row">
<div class="col col-md-12"{% if not result.completed %} hx-get="{% url 'extras:script_result' job_result_pk=result.pk %}" hx-trigger="every 3s"{% endif %}>
<div class="col col-md-12"{% if not result.completed %} hx-get="{% url 'extras:script_result' job_result_pk=result.pk %}" hx-trigger="every 5s"{% endif %}>
{% include 'extras/htmx/script_result.html' %}
</div>
</div>