summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorDavid Szotten <davidszotten@gmail.com>2017-03-02 15:25:05 +0000
committerTim Graham <timograham@gmail.com>2017-03-02 10:58:47 -0500
commit93c8e2d50d636e46ded9c6cfed0b0c4623457b74 (patch)
tree3f28af84133bec36291360abfda3a2ff201f7175 /django
parentf834c278b5476e02e846b22a94f433aef711b1e0 (diff)
[1.11.x] Fixed #27889 -- Fixed incorrect check error if ModelAdmin.ordering refers to 'pk'.
Backport of d82ee32aac323b7260cc95278c69b81d98dbd00a from master
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/checks.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/admin/checks.py b/django/contrib/admin/checks.py
index 286c1169a4..f000fc269b 100644
--- a/django/contrib/admin/checks.py
+++ b/django/contrib/admin/checks.py
@@ -468,7 +468,8 @@ class BaseModelAdminChecks(object):
else:
if field_name.startswith('-'):
field_name = field_name[1:]
-
+ if field_name == 'pk':
+ return []
try:
model._meta.get_field(field_name)
except FieldDoesNotExist: