Parcourir la source

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

Mathieu PAYROL il y a 4 ans
Parent
commit
46f4359e1f
2 fichiers modifiés avec 28 ajouts et 2 suppressions
  1. 17 1
      netbox/extras/tables.py
  2. 11 1
      netbox/templates/extras/objectchange.html

+ 17 - 1
netbox/extras/tables.py

@@ -29,6 +29,14 @@ CONFIGCONTEXT_ACTIONS = """
 {% 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>
@@ -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'
@@ -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):

+ 11 - 1
netbox/templates/extras/objectchange.html

@@ -36,7 +36,17 @@
                         </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>