Merge pull request #85 from Inter-Actief/ticket-83-full_name

Django Admin full_name fix
This commit is contained in:
Jan-Jelle Kester 2017-01-12 19:58:57 +01:00 committed by GitHub
commit 2cf1cde264
2 changed files with 2 additions and 2 deletions

View file

@ -6,7 +6,7 @@ from .filters import ResourceTypeFilter
class LogEntryAdmin(admin.ModelAdmin, LogEntryAdminMixin):
list_display = ['created', 'resource_url', 'action', 'msg_short', 'user_url']
search_fields = ['timestamp', 'object_repr', 'changes', 'actor__full_name']
search_fields = ['timestamp', 'object_repr', 'changes', 'actor__first_name', 'actor__last_name']
list_filter = ['action', ResourceTypeFilter]
readonly_fields = ['created', 'resource_url', 'action', 'user_url', 'msg']
fieldsets = [

View file

@ -17,7 +17,7 @@ class LogEntryAdminMixin(object):
app_label, model = settings.AUTH_USER_MODEL.split('.')
viewname = 'admin:%s_%s_change' % (app_label, model.lower())
link = urlresolvers.reverse(viewname, args=[obj.actor.id])
return u'<a href="%s">%s</a>' % (link, obj.actor.full_name or obj.actor.email)
return u'<a href="%s">%s</a>' % (link, obj.actor.get_full_name() or obj.actor.email)
return 'system'
user_url.allow_tags = True
user_url.short_description = 'User'