Skip to content

Closes #8556: Add 'Full Name' column to Change Log table #8581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2022
Merged

Closes #8556: Add 'Full Name' column to Change Log table #8581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion netbox/extras/tables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@
{% 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 = """
{% if record.changed_object and record.changed_object.get_absolute_url %}
<a href="{{ record.changed_object.get_absolute_url }}">{{ record.object_repr }}</a>
Expand Down Expand Up @@ -204,6 +212,14 @@ class ObjectChangeTable(BaseTable):
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 = ChoiceFieldColumn()
changed_object_type = ContentTypeColumn(
verbose_name='Type'
Expand All @@ -219,7 +235,7 @@ class ObjectChangeTable(BaseTable):

class Meta(BaseTable.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(BaseTable):
Expand Down
12 changes: 11 additions & 1 deletion netbox/templates/extras/objectchange.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,17 @@ <h5 class="card-header">
</td>
</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>
{{ object.user|default:object.user_name }}
</td>
Expand Down