NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-16 20:22:53 -06:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Use annotated_date also for updated datetimes

Browse Source 
This changes the text from: Updated 5 months, 1 week ago
to: Updated 2021-01-24 00:33 (5 months, 1 week ago)

Co-authored-by: Jeremy Stretch <jstretch@ns1.com>
This commit is contained in:
Robin Schneider 2021-07-02 22:11:50 +02:00
parent 0ad9b83623
commit 74f1b51b38
No known key found for this signature in database
GPG Key ID: A81E8006DC95EFE6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/templates/generic/object.html
View File

@ -43,7 +43,7 @@
<p> <p>
<small class="text-muted"> <small class="text-muted">
Created {{ object.created|annotated_date }} &middot; Created {{ object.created|annotated_date }} &middot;
Updated <span title="{{ object.last_updated|date:'SHORT_DATETIME_FORMAT' }} ({{ object.last_updated|date:'DATETIME_FORMAT' }})">{{ object.last_updated|timesince }}</span> ago Updated {{ object.last_updated|annotated_date }} ({{ object.last_updated|timesince }} ago)
</small> </small>
<span class="label label-default">{{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }}</span> <span class="label label-default">{{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }}</span>
</p> </p>

2
netbox/templates/users/userkey.html
View File

@ -22,7 +22,7 @@
<p> <p>
<small class="text-muted"> <small class="text-muted">
Created {{ object.created|annotated_date }} &middot; Created {{ object.created|annotated_date }} &middot;
Updated <span title="{{ object.last_updated|date:'SHORT_DATETIME_FORMAT' }} ({{ object.last_updated|date:'DATETIME_FORMAT' }})">{{ object.last_updated|timesince }}</span> ago Updated {{ object.last_updated|annotated_date }} ({{ object.last_updated|timesince }} ago)
</p> </p>
{% if not object.is_active %} {% if not object.is_active %}
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning" role="alert">