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

Merge v2.11.8 changes

Browse Source
This commit is contained in:
jeremystretch
2021-07-06 12:10:29 -04:00
parent 57fc6efd4c c585175214
commit 88e382e7a1
40 changed files with 264 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netbox/templates/extras/journalentry.html
+1 -1
View File
@@ -26,7 +26,7 @@
<tr>
<th scope="row">Created</th>
<td>
{{ object.created }}
{{ object.created|annotated_date }}
</td>
</tr>
<tr>
netbox/templates/extras/objectchange.html
+1 -1
View File
@@ -44,7 +44,7 @@
<tr>
<th scope="row">Time</th>
<td>
{{ object.time }}
{{ object.time|annotated_date }}
</td>
</tr>
<tr>
netbox/templates/extras/report.html
+1 -1
View File
@@ -31,7 +31,7 @@
<div class="col col-md-12">
{% if report.result %}
Last run: <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}">
<strong>{{ report.result.created }}</strong>
<strong>{{ report.result.created|annotated_date }}</strong>
</a>
{% endif %}
</div>
netbox/templates/extras/report_list.html
+1 -1
View File
@@ -35,7 +35,7 @@
<td>{{ report.description|render_markdown|placeholder }}</td>
<td class="text-end">
{% if report.result %}
<a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}">{{ report.result.created }}</a>
<a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}">{{ report.result.created|annotated_date }}</a>
{% else %}
<span class="text-muted">Never</span>
{% endif %}
netbox/templates/extras/report_result.html
+1 -1
View File
@@ -13,7 +13,7 @@
<div class="row">
<div class="col col-md-12">
<p>
Run: <strong>{{ result.created }}</strong>
Run: <strong>{{ result.created|annotated_date }}</strong>
{% if result.completed %}
Duration: <strong>{{ result.duration }}</strong>
{% else %}
netbox/templates/extras/script_list.html
+1 -1
View File
@@ -30,7 +30,7 @@
<td>{{ script.Meta.description|render_markdown }}</td>
{% if script.result %}
<td class="text-end">
<a href="{% url 'extras:script_result' job_result_pk=script.result.pk %}">{{ script.result.created }}</a>
<a href="{% url 'extras:script_result' job_result_pk=script.result.pk %}">{{ script.result.created|annotated_date }}</a>
</td>
{% else %}
<td class="text-end text-muted">Never</td>
netbox/templates/extras/script_result.html
+2 -2
View File
@@ -19,7 +19,7 @@
<li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}">Scripts</a></li>
<li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}#module.{{ script.module }}">{{ script.module|bettertitle }}</a></li>
<li class="breadcrumb-item"><a href="{% url 'extras:script' module=script.module name=class_name %}">{{ script }}</a></li>
<li class="breadcrumb-item">{{ result.created }}</li>
<li class="breadcrumb-item">{{ result.created|annotated_date }}</li>
</ol>
</nav>
</div>
@@ -38,7 +38,7 @@
</ul>
<div class="tab-content my-3">
<p>
Run: <strong>{{ result.created }}</strong>
Run: <strong>{{ result.created|annotated_date }}</strong>
{% if result.completed %}
Duration: <strong>{{ result.duration }}</strong>
{% else %}