mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

[1.6.x] Fixed #23123 -- Don't use a bare except in ModelAdmin documentation

Browse Source 
Thanks to wkschwartz for the report and to Tim for the patch.

Backport of e5619330e2 from master
This commit is contained in:
Baptiste Mispelon 2014-07-29 11:06:32 +02:00 committed by Tim Graham
parent 6c70b1d7df
commit 8e25b696ba
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/ref/contrib/admin/index.txt
View File

@ -1189,9 +1189,10 @@ templates used by the :class:`ModelAdmin` views:
queryset, use_distinct = super(PersonAdmin, self).get_search_results(request, queryset, search_term) queryset, use_distinct = super(PersonAdmin, self).get_search_results(request, queryset, search_term)
try: try:
search_term_as_int = int(search_term) search_term_as_int = int(search_term)
queryset |= self.model.objects.filter(age=search_term_as_int) except ValueError:
except:
pass pass
else:
queryset |= self.model.objects.filter(age=search_term_as_int)
return queryset, use_distinct return queryset, use_distinct
.. method:: ModelAdmin.save_related(request, form, formsets, change) .. method:: ModelAdmin.save_related(request, form, formsets, change)