NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #8581 from mathieu-mp/8556-add-full-name-to-change-log-tables

Browse Source 
Closes #8556: Add 'Full Name' column to Change Log table
This commit is contained in:
Jeremy Stretch 2022-02-14 09:49:36 -05:00 committed by GitHub
commit f058850598
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
netbox/extras/tables.py
View File

@ -29,6 +29,14 @@ CONFIGCONTEXT_ACTIONS = """
{% endif %} {% endif %}
""" """
OBJECTCHANGE_FULL_NAME = """
{% if record.user.first_name or record.user.last_name %}
{{ record.user.first_name }} {{ record.user.last_name }}
{% else %}
{{ record.user|default:record.user_name }}
{% endif %}
"""
OBJECTCHANGE_OBJECT = """ OBJECTCHANGE_OBJECT = """
{% if record.changed_object and record.changed_object.get_absolute_url %} {% if record.changed_object and record.changed_object.get_absolute_url %}
<a href="{{ record.changed_object.get_absolute_url }}">{{ record.object_repr }}</a> <a href="{{ record.changed_object.get_absolute_url }}">{{ record.object_repr }}</a>
@ -204,6 +212,14 @@ class ObjectChangeTable(BaseTable):
linkify=True, linkify=True,
format=settings.SHORT_DATETIME_FORMAT format=settings.SHORT_DATETIME_FORMAT
) )
user_name = tables.Column(
verbose_name='Username'
)
full_name = tables.TemplateColumn(
template_code=OBJECTCHANGE_FULL_NAME,
verbose_name='Full Name',
orderable=False
)
action = ChoiceFieldColumn() action = ChoiceFieldColumn()
changed_object_type = ContentTypeColumn( changed_object_type = ContentTypeColumn(
verbose_name='Type' verbose_name='Type'
@ -219,7 +235,7 @@ class ObjectChangeTable(BaseTable):
class Meta(BaseTable.Meta): class Meta(BaseTable.Meta):
model = ObjectChange model = ObjectChange
fields = ('id', 'time', 'user_name', 'action', 'changed_object_type', 'object_repr', 'request_id') fields = ('id', 'time', 'user_name', 'full_name', 'action', 'changed_object_type', 'object_repr', 'request_id')
class ObjectJournalTable(BaseTable): class ObjectJournalTable(BaseTable):

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

@ -36,7 +36,17 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th scope="row">User</th> <th scope="row">Full Name</th>
<td>
{% if object.user.first_name or object.user.last_name %}
{{ object.user.first_name }} {{ object.user.last_name }}
{% else %}
{{ object.user|default:object.user_name }}
{% endif %}
</td>
</tr>
<tr>
<th scope="row">Username</th>
<td> <td>
{{ object.user|default:object.user_name }} {{ object.user|default:object.user_name }}
</td> </td>