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 v3.1.8

Browse Source
This commit is contained in:
jeremystretch
2022-02-15 10:05:07 -05:00
parent b40afd1006 b5e4fdc3d8
commit aa85ae89c1
14 changed files with 113 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
netbox/extras/tables.py
View File

@ -26,6 +26,11 @@ CONFIGCONTEXT_ACTIONS = """
{% endif %}
"""
OBJECTCHANGE_FULL_NAME = """
{% load helpers %}
{{ record.user.get_full_name|placeholder }}
"""
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>
@ -196,6 +201,14 @@ class ObjectChangeTable(NetBoxTable):
linkify=True,
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 = columns.ChoiceFieldColumn()
changed_object_type = columns.ContentTypeColumn(
verbose_name='Type'
@ -212,7 +225,7 @@ class ObjectChangeTable(NetBoxTable):
class Meta(NetBoxTable.Meta):
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(NetBoxTable):