mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-26 12:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #30981 -- Fixed admin changelist crash when using F() or OrderBy() expressions in admin_order_field.

Browse source
This commit is contained in:
Hasan Ramezani 2019-11-15 21:59:22 +01:00 • committed by Mariusz Felisiak
parent e9def97d10
commit 0284a26af9
3 changed files with 56 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/admin_views/admin.py
View file

@ -105,6 +105,7 @@ class ArticleAdmin(admin.ModelAdmin):
'content', 'date', callable_year, 'model_year', 'modeladmin_year',
'model_year_reversed', 'section', lambda obj: obj.title,
'order_by_expression', 'model_property_year', 'model_month',
'order_by_f_expression', 'order_by_orderby_expression',
)
list_editable = ('section',)
list_filter = ('date', 'section')
@ -122,12 +123,20 @@ class ArticleAdmin(admin.ModelAdmin):
})
)
# These orderings aren't particularly useful but show that expressions can
# be used for admin_order_field.
def order_by_expression(self, obj):
return obj.model_year
# This ordering isn't particularly useful but shows that expressions can
# be used for admin_order_field.
order_by_expression.admin_order_field = models.F('date') + datetime.timedelta(days=3)
def order_by_f_expression(self, obj):
return obj.model_year
order_by_f_expression.admin_order_field = models.F('date')
def order_by_orderby_expression(self, obj):
return obj.model_year
order_by_orderby_expression.admin_order_field = models.F('date').asc(nulls_last=True)
def changelist_view(self, request):
return super().changelist_view(request, extra_context={'extra_var': 'Hello!'})