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

Follow @jeremystretch advices

Browse Source
This commit is contained in:
Mathieu PAYROL 2022-02-07 17:57:58 +01:00
parent e5243c2bf1
commit 7ef5107533
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
netbox/extras/tables.py
View File

@ -29,9 +29,9 @@ CONFIGCONTEXT_ACTIONS = """
{% endif %} {% endif %}
""" """
OBJECTCHANGE_USER = """ OBJECTCHANGE_FULL_NAME = """
{% if record.user and record.user.first_name and record.user.last_name %} {% if record.user.first_name or record.user.last_name %}
{{ record.user.first_name }} {{ record.user.last_name }} (@{{ record.user }}) {{ record.user.first_name }} {{ record.user.last_name }}
{% else %} {% else %}
{{ record.user|default:record.user_name }} {{ record.user|default:record.user_name }}
{% endif %} {% endif %}
@ -212,9 +212,14 @@ class ObjectChangeTable(BaseTable):
linkify=True, linkify=True,
format=settings.SHORT_DATETIME_FORMAT format=settings.SHORT_DATETIME_FORMAT
) )
user = tables.TemplateColumn( user_name = tables.TemplateColumn(
template_code=OBJECTCHANGE_USER, verbose_name='Username',
verbose_name='User name' orderable=False
)
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(
@ -231,7 +236,7 @@ class ObjectChangeTable(BaseTable):
class Meta(BaseTable.Meta): class Meta(BaseTable.Meta):
model = ObjectChange model = ObjectChange
fields = ('id', 'time', 'user', '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,15 +36,21 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th scope="row">User</th> <th scope="row">Full Name</th>
<td> <td>
{% if object.user and object.user.first_name and object.user.last_name %} {% if object.user.first_name or object.user.last_name %}
{{ object.user.first_name }} {{ object.user.last_name }} (@{{ object.user }}) {{ object.user.first_name }} {{ object.user.last_name }}
{% else %} {% else %}
{{ object.user|default:object.user_name }} {{ object.user|default:object.user_name }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
<tr>
<th scope="row">Username</th>
<td>
{{ object.user|default:object.user_name }}
</td>
</tr>
<tr> <tr>
<th scope="row">Action</th> <th scope="row">Action</th>
<td> <td>