From 054ce2aa02c88221ffa5665a4b9a5739cbbd0a39 Mon Sep 17 00:00:00 2001 From: Juan Catalano Date: Tue, 19 Mar 2013 19:17:31 -0300 Subject: Fixed #20088 -- Changed get_admin_log not to depend on User id field Before this change, the get_admin_log method would expect User model's FK to be named `id`. When changing that FK name, admin/index.html rendering would fail. This includes: * Changed the use of id for the use of pk property. * Added a regression test that fails without the patch. This commit refs #20088. --- django/contrib/admin/templatetags/log.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django') diff --git a/django/contrib/admin/templatetags/log.py b/django/contrib/admin/templatetags/log.py index 463e0792f0..f70ee2731d 100644 --- a/django/contrib/admin/templatetags/log.py +++ b/django/contrib/admin/templatetags/log.py @@ -16,8 +16,8 @@ class AdminLogNode(template.Node): else: user_id = self.user if not user_id.isdigit(): - user_id = context[self.user].id - context[self.varname] = LogEntry.objects.filter(user__id__exact=user_id).select_related('content_type', 'user')[:int(self.limit)] + user_id = context[self.user].pk + context[self.varname] = LogEntry.objects.filter(user__pk__exact=user_id).select_related('content_type', 'user')[:int(self.limit)] return '' @register.tag -- cgit v1.3