diff options
| author | David Szotten <davidszotten@gmail.com> | 2017-03-02 15:25:05 +0000 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-03-02 10:25:05 -0500 |
| commit | d82ee32aac323b7260cc95278c69b81d98dbd00a (patch) | |
| tree | 3c5bd1f02b931194d783a888ac636a4c6a241c42 | |
| parent | 7588d7e439a5deb7f534bdeb2abe407b937e3c1a (diff) | |
Fixed #27889 -- Fixed incorrect check error if ModelAdmin.ordering refers to 'pk'.
| -rw-r--r-- | django/contrib/admin/checks.py | 3 | ||||
| -rw-r--r-- | tests/modeladmin/test_checks.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/django/contrib/admin/checks.py b/django/contrib/admin/checks.py index dad809a826..07d3341569 100644 --- a/django/contrib/admin/checks.py +++ b/django/contrib/admin/checks.py @@ -465,7 +465,8 @@ class BaseModelAdminChecks: else: if field_name.startswith('-'): field_name = field_name[1:] - + if field_name == 'pk': + return [] try: model._meta.get_field(field_name) except FieldDoesNotExist: diff --git a/tests/modeladmin/test_checks.py b/tests/modeladmin/test_checks.py index c90ed64958..decddee591 100644 --- a/tests/modeladmin/test_checks.py +++ b/tests/modeladmin/test_checks.py @@ -794,7 +794,7 @@ class OrderingCheckTests(CheckTestCase): def test_valid_case(self): class TestModelAdmin(ModelAdmin): - ordering = ('name',) + ordering = ('name', 'pk') self.assertIsValid(TestModelAdmin, ValidationTestModel) |