summaryrefslogtreecommitdiff
path: root/django/contrib/admin/views
diff options
context:
space:
mode:
authorkrishbharadwaj <krishna.bmsce@gmail.com>2016-04-23 23:05:18 +0530
committerTim Graham <timograham@gmail.com>2016-06-08 17:20:03 -0400
commitf6681393d3f53a67b4e0645e8d02f95579d8ae2d (patch)
treee948ad4c71febd776f62a1260f2038066c91fcc8 /django/contrib/admin/views
parentc8d2120b06e1b82cb0db896aa0f9767b2f14256c (diff)
Fixing #26524 -- Made a foreign key id reference in ModelAdmin.list_display display the id.
Diffstat (limited to 'django/contrib/admin/views')
-rw-r--r--django/contrib/admin/views/main.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
index 081488efb5..cf392e418f 100644
--- a/django/contrib/admin/views/main.py
+++ b/django/contrib/admin/views/main.py
@@ -371,6 +371,9 @@ class ChangeList(object):
pass
else:
if isinstance(field.remote_field, models.ManyToOneRel):
+ # <FK>_id field names don't require a join.
+ if field_name == field.get_attname():
+ continue
return True
return False