p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed some checks for Model._meta.one_to_one_field to prevent list_filter and the show_result_count in search_form.html. Fixes #2145. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Brian Rosner 2008-08-15 19:15:20 +00:00
parent c0d862d638
commit 417a4d66df
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,7 +302,7 @@ date_hierarchy = register.inclusion_tag('admin/date_hierarchy.html')(date_hierar
def search_form(cl): def search_form(cl):
return { return {
'cl': cl, 'cl': cl,
'show_result_count': cl.result_count != cl.full_result_count and not cl.opts.one_to_one_field, 'show_result_count': cl.result_count != cl.full_result_count,
'search_var': SEARCH_VAR 'search_var': SEARCH_VAR
} }
search_form = register.inclusion_tag('admin/search_form.html')(search_form) search_form = register.inclusion_tag('admin/search_form.html')(search_form)

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

@ -68,7 +68,7 @@ class ChangeList(object):
def get_filters(self, request): def get_filters(self, request):
filter_specs = [] filter_specs = []
if self.list_filter and not self.opts.one_to_one_field: if self.list_filter:
filter_fields = [self.lookup_opts.get_field(field_name) for field_name in self.list_filter] filter_fields = [self.lookup_opts.get_field(field_name) for field_name in self.list_filter]
for f in filter_fields: for f in filter_fields:
spec = FilterSpec.create(f, request, self.params, self.model, self.model_admin) spec = FilterSpec.create(f, request, self.params, self.model, self.model_admin)