diff --git a/auditlog/admin.py b/auditlog/admin.py index 240d609..e0b23c2 100644 --- a/auditlog/admin.py +++ b/auditlog/admin.py @@ -10,6 +10,14 @@ from auditlog.mixins import LogEntryAdminMixin LogEntry = get_logentry_model() +user_model = get_user_model() + +user_model_fields = [field.name for field in user_model._meta.get_fields()] + +has_first_and_last_name_fields = ( + "first_name" in user_model_fields and "last_name" in user_model_fields +) + @admin.register(LogEntry) class LogEntryAdmin(admin.ModelAdmin, LogEntryAdminMixin): @@ -27,10 +35,12 @@ class LogEntryAdmin(admin.ModelAdmin, LogEntryAdminMixin): "timestamp", "object_repr", "changes", - "actor__first_name", - "actor__last_name", - f"actor__{get_user_model().USERNAME_FIELD}", - ] + f"actor__{user_model.USERNAME_FIELD}", + ] + ( + ["actor__first_name", "actor__last_name"] + if has_first_and_last_name_fields + else [] + ) list_filter = ["action", ResourceTypeFilter, CIDFilter] readonly_fields = ["created", "resource_url", "action", "user_url", "msg"] fieldsets = [