innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.11.x] Fixed #27889 -- Fixed incorrect check error if ModelAdmin.ordering refers to 'pk'. 

Backport of d82ee32aac from master
This commit is contained in:
David Szotten 2017-03-02 15:25:05 +00:00 committed by Tim Graham
parent f834c278b5
commit 93c8e2d50d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/admin/checks.py
View File

@ -468,7 +468,8 @@ class BaseModelAdminChecks(object):
else: else:
if field_name.startswith('-'): if field_name.startswith('-'):
field_name = field_name[1:] field_name = field_name[1:]
if field_name == 'pk':
return []
try: try:
model._meta.get_field(field_name) model._meta.get_field(field_name)
except FieldDoesNotExist: except FieldDoesNotExist:

2
tests/modeladmin/test_checks.py
View File

@ -796,7 +796,7 @@ class OrderingCheckTests(CheckTestCase):
def test_valid_case(self): def test_valid_case(self):
class TestModelAdmin(ModelAdmin): class TestModelAdmin(ModelAdmin):
ordering = ('name',) ordering = ('name', 'pk')
self.assertIsValid(TestModelAdmin, ValidationTestModel) self.assertIsValid(TestModelAdmin, ValidationTestModel)