Added exception handling for get_queryset attribute.

master
Brandon Taylor 2015-04-08 22:06:14 -04:00
parent a5c1c53400
commit ad09081ab4
1 changed files with 8 additions and 2 deletions

View File

@ -47,7 +47,10 @@ class SortableAdminBase(object):
object_tools block to take people to the view to change the sorting.
"""
try:
qs_method = getattr(self, 'get_queryset', self.queryset)
except AttributeError:
qs_method = self.get_queryset
if get_is_sortable(qs_method(request)):
self.change_list_template = \
@ -116,7 +119,10 @@ class SortableAdmin(SortableAdminBase, ModelAdmin):
pass
# Apply any sort filters to create a subset of sortable objects
try:
qs_method = getattr(self, 'get_queryset', self.queryset)
except AttributeError:
qs_method = self.get_queryset
objects = qs_method(request).filter(**filters)
# Determine if we need to regroup objects relative to a