matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add related support to 'filter_objects_by_access' and 'get_allowed_class_objects' methods

Browse Source
This commit is contained in:
Roberto Rosario
2012-01-03 18:47:28 -04:00
parent 4ded57f27d
commit 1cd3c4e7d0
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/acls/managers.py
+19 -10
View File
@@ -95,11 +95,20 @@ class AccessEntryManager(models.Manager):
raise PermissionDenied(ugettext(u'Insufficient access.')) raise PermissionDenied(ugettext(u'Insufficient access.'))
def get_allowed_class_objects(self, permission, actor, cls): def get_allowed_class_objects(self, permission, actor, cls, related=None):
logger.debug('related: %s' % related)
actor_type = ContentType.objects.get_for_model(actor) actor_type = ContentType.objects.get_for_model(actor)
content_type = ContentType.objects.get_for_model(cls) content_type = ContentType.objects.get_for_model(cls)
if related:
return (obj.content_object for obj in self.model.objects.filter(holder_type=actor_type, holder_id=actor.pk, content_type=content_type, permission=permission.get_stored_permission)) master_list = [obj.content_object for obj in self.model.objects.select_related().filter(holder_type=actor_type, holder_id=actor.pk, permission=permission.get_stored_permission)]
logger.debug('master_list: %s' % master_list)
# TODO: update to use Q objects and check performance diff
# kwargs = {'%s__in' % related: master_list}
# Q(**kwargs)
return (obj for obj in cls.objects.all() if getattr(obj, related) in master_list)
else:
return (obj.content_object for obj in self.model.objects.filter(holder_type=actor_type, holder_id=actor.pk, content_type=content_type, permission=permission.get_stored_permission))
def get_acl_url(self, obj): def get_acl_url(self, obj):
content_type = ContentType.objects.get_for_model(obj) content_type = ContentType.objects.get_for_model(obj)
@@ -132,7 +141,7 @@ class AccessEntryManager(models.Manager):
content_type = ContentType.objects.get_for_model(obj) content_type = ContentType.objects.get_for_model(obj)
return (access.permission for access in self.model.objects.filter(content_type=content_type, object_id=obj.pk, holder_type=actor_type, holder_id=actor.pk)) return (access.permission for access in self.model.objects.filter(content_type=content_type, object_id=obj.pk, holder_type=actor_type, holder_id=actor.pk))
def filter_objects_by_access(self, permission, actor, object_list, exception_on_empty=False): def filter_objects_by_access(self, permission, actor, object_list, exception_on_empty=False, related=None):
logger.debug('exception_on_empty: %s' % exception_on_empty) logger.debug('exception_on_empty: %s' % exception_on_empty)
logger.debug('object_list: %s' % object_list) logger.debug('object_list: %s' % object_list)
@@ -150,7 +159,7 @@ class AccessEntryManager(models.Manager):
try: try:
# Try to process as a QuerySet # 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])]) qs = object_list.filter(pk__in=[obj.pk for obj in self.get_allowed_class_objects(permission, actor, object_list[0].__class__, related)])
logger.debug('qs: %s' % qs) logger.debug('qs: %s' % qs)
if qs.count() == 0 and exception_on_empty == True: if qs.count() == 0 and exception_on_empty == True:
@@ -158,13 +167,13 @@ class AccessEntryManager(models.Manager):
return qs return qs
except AttributeError: except AttributeError:
# Fallback to a list filtered list # Fallback to a filtered list
obj_list = list(set(object_list) & set(self.get_allowed_class_objects(permission, actor, object_list[0]))) object_list = list(set(object_list) & set(self.get_allowed_class_objects(permission, actor, object_list[0].__class__, related)))
logger.debug('obj_list: %s' % obj_list) logger.debug('object_list: %s' % object_list)
if len(obj_list) == 0 and exception_on_empty == True: if len(object_list) == 0 and exception_on_empty == True:
raise PermissionDenied raise PermissionDenied
return obj_list return object_list
class DefaultAccessEntryManager(models.Manager): class DefaultAccessEntryManager(models.Manager):