diff options
| author | Dima Kudosh <LagMegantic@yandex.ru> | 2017-06-25 21:17:13 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-09-05 19:10:20 -0400 |
| commit | 093fd479d6be1790c6dc174f9df3a895b50e8a2f (patch) | |
| tree | 3829042666e7e74d62cc364363b4a18c29d86228 /django | |
| parent | 3d2c3905a606f373d1b4ad386ad8343112f384f7 (diff) | |
Fixed #28335 -- Allowed query expressions in Meta.ordering.
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py index d39c0b9ea6..dd2ac1de8c 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -1553,8 +1553,8 @@ class Model(metaclass=ModelBase): errors = [] fields = cls._meta.ordering - # Skip '?' fields. - fields = (f for f in fields if f != '?') + # Skip expressions and '?' fields. + fields = (f for f in fields if isinstance(f, str) and f != '?') # Convert "-field" to "field". fields = ((f[1:] if f.startswith('-') else f) for f in fields) |