diff options
| author | Preston Holmes <preston@ptone.com> | 2013-03-19 15:56:01 -0700 |
|---|---|---|
| committer | Preston Holmes <preston@ptone.com> | 2013-03-19 15:56:01 -0700 |
| commit | 7a3409fc645c3e9c839fef08f05ec3bbcd9fb9cb (patch) | |
| tree | a045b624b14b736e914a0ba4c4d24ab463f743df /django | |
| parent | bc4111ba68e5eede1f68882a16d68441a845e30b (diff) | |
| parent | 054ce2aa02c88221ffa5665a4b9a5739cbbd0a39 (diff) | |
Merge pull request #931 from catalanojuan/fix-admin-log-dependency-on-user-id-field-20088
Fixed #20088 -- Changed get_admin_log not to depend on User id field
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/templatetags/log.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |