From 7ef5107533baf077060b3ae6094e537d1b46ff58 Mon Sep 17 00:00:00 2001
From: Mathieu PAYROL <mathieu.payrol-prestataire@labanquepostale.fr>
Date: Mon, 7 Feb 2022 17:57:58 +0100
Subject: [PATCH] Follow @jeremystretch advices

---
 netbox/extras/tables.py                   | 19 ++++++++++++-------
 netbox/templates/extras/objectchange.html | 12 +++++++++---
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py
index 041b9fc75..b0f854544 100644
--- a/netbox/extras/tables.py
+++ b/netbox/extras/tables.py
@@ -29,9 +29,9 @@ CONFIGCONTEXT_ACTIONS = """
 {% 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 }})
+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 %}
@@ -212,9 +212,14 @@ class ObjectChangeTable(BaseTable):
         linkify=True,
         format=settings.SHORT_DATETIME_FORMAT
     )
-    user = tables.TemplateColumn(
-        template_code=OBJECTCHANGE_USER,
-        verbose_name='User name'
+    user_name = tables.TemplateColumn(
+        verbose_name='Username',
+        orderable=False
+    )
+    full_name = tables.TemplateColumn(
+        template_code=OBJECTCHANGE_FULL_NAME,
+        verbose_name='Full Name',
+        orderable=False
     )
     action = ChoiceFieldColumn()
     changed_object_type = ContentTypeColumn(
@@ -231,7 +236,7 @@ class ObjectChangeTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         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):
diff --git a/netbox/templates/extras/objectchange.html b/netbox/templates/extras/objectchange.html
index 2469d6fbd..f8b1ad547 100644
--- a/netbox/templates/extras/objectchange.html
+++ b/netbox/templates/extras/objectchange.html
@@ -36,15 +36,21 @@
                         </td>
                     </tr>
                     <tr>
-                        <th scope="row">User</th>
+                        <th scope="row">Full Name</th>
                         <td>
-                            {% if object.user and object.user.first_name and object.user.last_name %}
-                                {{ object.user.first_name }} {{ object.user.last_name }} (@{{ object.user }})
+                            {% 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>
+                    </tr>
                     <tr>
                         <th scope="row">Action</th>
                         <td>