p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed redundant filtering in date_hierarchy template tag. 

cl.queryset is already filtered by the current selections.
This commit is contained in:
Haki Benita 2017-12-16 20:48:40 +02:00 committed by Tim Graham
parent 5a669ae2f4
commit 2014db50f4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/admin/templatetags/admin_list.py
View File

@ -370,8 +370,7 @@ def date_hierarchy(cl):
'choices': [{'title': capfirst(formats.date_format(day, 'MONTH_DAY_FORMAT'))}] 'choices': [{'title': capfirst(formats.date_format(day, 'MONTH_DAY_FORMAT'))}]
} }
elif year_lookup and month_lookup: elif year_lookup and month_lookup:
days = cl.queryset.filter(**{year_field: year_lookup, month_field: month_lookup}) days = getattr(cl.queryset, 'dates')(field_name, 'day')
days = getattr(days, 'dates')(field_name, 'day')
return { return {
'show': True, 'show': True,
'back': { 'back': {
@ -384,8 +383,7 @@ def date_hierarchy(cl):
} for day in days] } for day in days]
} }
elif year_lookup: elif year_lookup:
months = cl.queryset.filter(**{year_field: year_lookup}) months = getattr(cl.queryset, 'dates')(field_name, 'month')
months = getattr(months, 'dates')(field_name, 'month')
return { return {
'show': True, 'show': True,
'back': { 'back': {