From 56a9ab6ab8bd6f68da44c6391df16737c9eded72 Mon Sep 17 00:00:00 2001 From: Onur YALAZI Date: Wed, 18 Jan 2017 13:40:22 +0200 Subject: [PATCH 1/2] LogEntryAdminMixin throws Attribute error If a user misses full_name --- src/auditlog/mixins.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/auditlog/mixins.py b/src/auditlog/mixins.py index a63c207..7b3c995 100644 --- a/src/auditlog/mixins.py +++ b/src/auditlog/mixins.py @@ -17,7 +17,10 @@ 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'%s' % (link, obj.actor.get_full_name() or obj.actor.email) + try: + return u'%s' % (link, obj.actor.get_full_name()) + except AttributeError: + return u'%s' % (link, obj.actor.email) return 'system' user_url.allow_tags = True user_url.short_description = 'User' From eef4a14cd34aa8d9eacc2b775d14c7557da0ff8f Mon Sep 17 00:00:00 2001 From: Onur YALAZI Date: Sun, 22 Jan 2017 11:32:44 +0200 Subject: [PATCH 2/2] Changed to actor's string represantation Depending on actor's attributes is error prone, developers can extend the user model without the needed attributes. --- src/auditlog/mixins.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/auditlog/mixins.py b/src/auditlog/mixins.py index 7b3c995..7e3c626 100644 --- a/src/auditlog/mixins.py +++ b/src/auditlog/mixins.py @@ -17,10 +17,8 @@ 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]) - try: - return u'%s' % (link, obj.actor.get_full_name()) - except AttributeError: - return u'%s' % (link, obj.actor.email) + return u'%s' % (link, obj.actor) + return 'system' user_url.allow_tags = True user_url.short_description = 'User'