mirror of
https://github.com/netbox-community/netbox.git
synced 2025-08-17 04:58:16 -06:00
#8556 Display friendly username in ChangeLog
This commit is contained in:
parent
795134c084
commit
2bcb2bb854
@ -29,6 +29,14 @@ CONFIGCONTEXT_ACTIONS = """
|
|||||||
{% endif %}
|
{% 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 = """
|
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,10 @@ class ObjectChangeTable(BaseTable):
|
|||||||
linkify=True,
|
linkify=True,
|
||||||
format=settings.SHORT_DATETIME_FORMAT
|
format=settings.SHORT_DATETIME_FORMAT
|
||||||
)
|
)
|
||||||
|
user = tables.TemplateColumn(
|
||||||
|
template_code=OBJECTCHANGE_USER,
|
||||||
|
verbose_name='User name'
|
||||||
|
)
|
||||||
action = ChoiceFieldColumn()
|
action = ChoiceFieldColumn()
|
||||||
changed_object_type = ContentTypeColumn(
|
changed_object_type = ContentTypeColumn(
|
||||||
verbose_name='Type'
|
verbose_name='Type'
|
||||||
@ -219,7 +231,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', 'action', 'changed_object_type', 'object_repr', 'request_id')
|
||||||
|
|
||||||
|
|
||||||
class ObjectJournalTable(BaseTable):
|
class ObjectJournalTable(BaseTable):
|
||||||
|
@ -38,7 +38,11 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th scope="row">User</th>
|
<th scope="row">User</th>
|
||||||
<td>
|
<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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
Loading…
Reference in New Issue
Block a user