From ad09081ab45a9c89efa1e11fadabf883f060cc2d Mon Sep 17 00:00:00 2001 From: Brandon Taylor Date: Wed, 8 Apr 2015 22:06:14 -0400 Subject: [PATCH] Added exception handling for get_queryset attribute. --- adminsortable/admin.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/adminsortable/admin.py b/adminsortable/admin.py index 6205364..bd684f9 100644 --- a/adminsortable/admin.py +++ b/adminsortable/admin.py @@ -47,7 +47,10 @@ class SortableAdminBase(object): object_tools block to take people to the view to change the sorting. """ - qs_method = getattr(self, 'get_queryset', self.queryset) + 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 - qs_method = getattr(self, 'get_queryset', self.queryset) + 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