From 43c52d64e7027a547c44bbbe29866699f4c8a1c6 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 3 Jan 2012 02:26:29 -0400 Subject: [PATCH] Add empty object_list support to the 'filter_objects_by_access' manager method --- apps/acls/models.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/acls/models.py b/apps/acls/models.py index c39a37709e..bb9692a54b 100644 --- a/apps/acls/models.py +++ b/apps/acls/models.py @@ -274,6 +274,14 @@ class AccessEntryManager(models.Manager): if actor.is_superuser or actor.is_staff: return object_list + try: + if object_list.count() == 0: + return object_list + except TypeError: + # object_list is not a queryset + if len(object_list) == 0: + return object_list + try: # Try to process as a QuerySet qs = object_list.filter(pk__in=[obj.pk for obj in self.get_allowed_class_objects(permission, actor, object_list[0])])