mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-08 13:09:13 +00:00
Code Issues 32 Releases Wiki Activity

[2.1.x] Fixed #29428 -- Fixed admin changelist crash when using a query expression without asc()/desc() in the ordering.

Browse Source 
Backport of 0d8e3e608ee9aab5076d497664aa97e0a29e523e from master
This commit is contained in:
Tim Graham 2018-06-14 14:22:04 -04:00
parent aea0e2b9ca
commit a041161bde
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/admin/views/main.py
View File

@ -17,7 +17,7 @@ from django.core.exceptions import (
) )
from django.core.paginator import InvalidPage from django.core.paginator import InvalidPage
from django.db import models from django.db import models
from django.db.models.expressions import F, OrderBy from django.db.models.expressions import Combinable, F, OrderBy
from django.urls import reverse from django.urls import reverse
from django.utils.http import urlencode from django.utils.http import urlencode
from django.utils.timezone import make_aware from django.utils.timezone import make_aware
@ -326,7 +326,9 @@ class ChangeList:
# the right column numbers absolutely, because there might be more # the right column numbers absolutely, because there might be more
# than one column associated with that ordering, so we guess. # than one column associated with that ordering, so we guess.
for field in ordering: for field in ordering:
if isinstance(field, OrderBy): if isinstance(field, (Combinable, OrderBy)):
if not isinstance(field, OrderBy):
field = field.asc()
if isinstance(field.expression, F): if isinstance(field.expression, F):
order_type = 'desc' if field.descending else 'asc' order_type = 'desc' if field.descending else 'asc'
field = field.expression.name field = field.expression.name

3
docs/releases/2.0.7.txt
View File

@ -9,4 +9,5 @@ Django 2.0.7 fixes several bugs in 2.0.6.
Bugfixes Bugfixes
======== ========
* ... * Fixed admin changelist crash when using a query expression without ``asc()``
or ``desc()`` in the page's ordering (:ticket:`29428`).

11
tests/admin_changelist/tests.py
View File

@ -77,6 +77,17 @@ class ChangeListTests(TestCase):
cl = m.get_changelist_instance(request) cl = m.get_changelist_instance(request)
self.assertEqual(cl.get_ordering_field_columns(), {3: 'desc', 2: 'asc'}) self.assertEqual(cl.get_ordering_field_columns(), {3: 'desc', 2: 'asc'})
def test_specified_ordering_by_f_expression_without_asc_desc(self):
class OrderedByFBandAdmin(admin.ModelAdmin):
list_display = ['name', 'genres', 'nr_of_members']
ordering = (F('nr_of_members'), Upper('name'), F('genres'))
m = OrderedByFBandAdmin(Band, custom_site)
request = self.factory.get('/band/')
request.user = self.superuser
cl = m.get_changelist_instance(request)
self.assertEqual(cl.get_ordering_field_columns(), {3: 'asc', 2: 'asc'})
def test_select_related_preserved(self): def test_select_related_preserved(self):
""" """
Regression test for #10348: ChangeList.get_queryset() shouldn't Regression test for #10348: ChangeList.get_queryset() shouldn't