NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-16 12:38:17 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

#8556 Display friendly username in ChangeLog

Browse Source
This commit is contained in:
mathieu-mp 2022-02-04 18:39:09 +01:00 committed by GitHub
parent 795134c084
commit 2bcb2bb854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/extras/tables.py
View File

@ -29,6 +29,14 @@ CONFIGCONTEXT_ACTIONS = """
{% endif %}
"""
OBJECTCHANGE_USER = """
{% if record.user and record.user.first_name and record.user.last_name %}
{{ record.user.first_name }} {{ record.user.last_name }} (@{{ record.user }})
{% else %}
{{ record.user|default:record.user_name }}
{% endif %}
"""
OBJECTCHANGE_OBJECT = """
{% if record.changed_object and record.changed_object.get_absolute_url %}
<a href="{{ record.changed_object.get_absolute_url }}">{{ record.object_repr }}</a>
@ -204,6 +212,10 @@ class ObjectChangeTable(BaseTable):
linkify=True,
format=settings.SHORT_DATETIME_FORMAT
)
user = tables.TemplateColumn(
template_code=OBJECTCHANGE_USER,
verbose_name='User name'
)
action = ChoiceFieldColumn()
changed_object_type = ContentTypeColumn(
verbose_name='Type'
@ -218,8 +230,8 @@ class ObjectChangeTable(BaseTable):
)
class Meta(BaseTable.Meta):
model = ObjectChange
fields = ('id', 'time', 'user_name', 'action', 'changed_object_type', 'object_repr', 'request_id')
model = ObjectChange
fields = ('id', 'time', 'user', 'action', 'changed_object_type', 'object_repr', 'request_id')
class ObjectJournalTable(BaseTable):

6
netbox/templates/extras/objectchange.html
View File

@ -38,7 +38,11 @@
<tr>
<th scope="row">User</th>
<td>
{{ object.user|default:object.user_name }}
{% if object.user and object.user.first_name and object.user.last_name %}
{{ object.user.first_name }} {{ object.user.last_name }} (@{{ object.user }})
{% else %}
{{ object.user|default:object.user_name }}
{% endif %}
</td>
</tr>
<tr>