ACL app updates, display generic object proper ACL holders list with content type icon widget

apps/acls/models.py

@@ -3,21 +3,20 @@ from django.utils.translation import ugettext_lazy as _
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic
 from django.contrib.auth.models import User
-#from django.shortcuts import get_object_or_404
-#from django.utils.translation import ugettext
 from django.core.exceptions import PermissionDenied
 from django.core.urlresolvers import reverse
 
-
 from permissions.models import Permission
 
+from acls.widgets import object_w_content_type_icon
+
 
 class AccessEntryManager(models.Manager):
 	def grant(self, permission, requester, obj):
 		"""
 		Grant a permission (what), (to) a requester, (on) a specific object
 		"""
-		access_entry, created = AccessEntry.objects.get_or_create(
+		access_entry, created = self.model.objects.get_or_create(
 			permission=permission,
 			holder_type=ContentType.objects.get_for_model(requester),
 			holder_id=requester.pk,
@@ -28,7 +27,7 @@ class AccessEntryManager(models.Manager):
 
 	def revoke(self, permission, holder, obj):
 		try:
-			access_entry = AccessEntry.objects.get(
+			access_entry = self.model.objects.get(
 				permission=permission,
 				holder_type=ContentType.objects.get_for_model(holder),
 				holder_id=holder.pk,
@@ -37,7 +36,7 @@ class AccessEntryManager(models.Manager):
 			)
 			access_entry.delete()
 			return True
-		except AccessEntry.DoesNotExist:
+		except self.model.DoesNotExist:
 			return False		
 
 	def check_accesses(self, permission_list, requester, obj):
@@ -45,7 +44,7 @@ class AccessEntryManager(models.Manager):
 			permission = get_object_or_404(Permission,
 				namespace=permission_item['namespace'], name=permission_item['name'])
 			try:
-				access_entry = AccessEntry.objects.get(
+				access_entry = self.model.objects.get(
 					permission=permission,
 					holder_type=ContentType.objects.get_for_model(requester),
 					holder_id=requester.pk,
@@ -53,26 +52,56 @@ class AccessEntryManager(models.Manager):
 					object_id=obj.pk
 				)
 				return True
-			except AccessEntry.DoesNotExist:
+			except self.model.DoesNotExist:
 				raise PermissionDenied(ugettext(u'Insufficient permissions.'))
 				
 	def get_acl_url(self, obj):
-		content_type = ContentType.objects.get_for_model(obj.__class__)
-		return reverse('acl_list', args=[content_type.app_label, content_type.model, obj.pk])	
+		content_type = ContentType.objects.get_for_model(obj)
+		return reverse('acl_list', args=[content_type.app_label, content_type.model, obj.pk])
+		
+	def get_holders_for(self, obj):
+		content_type = ContentType.objects.get_for_model(obj)
+		holder_list = []
+		for access_entry in self.model.objects.filter(content_type=content_type, object_id=obj.pk):
+			entry = {
+				'object': access_entry.holder_object,
+				'label': '%s: %s' % (access_entry.holder_type, access_entry.holder_object),
+				'widget': object_w_content_type_icon(access_entry.holder_object),
+			}
+			if entry not in holder_list:
+				holder_list.append(entry)
+		
+		return holder_list
+
+	def get_acls_for_holder(self, obj, holder):
+		holder_type = ContentType.objects.get_for_model(holder)
+		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=holder_type, holder_id=holder.pk)]
 
 
 class AccessEntry(models.Model):
 	permission = models.ForeignKey(Permission, verbose_name=_(u'permission'))
-	holder_type = models.ForeignKey(ContentType,
-		related_name='access_holder',
-		limit_choices_to={'model__in': ('user', 'group', 'role')})
-	holder_id = models.PositiveIntegerField()
-	holder_object = generic.GenericForeignKey(ct_field='holder_type', fk_field='holder_id')
 
-	content_type = models.ForeignKey(ContentType,
-		related_name='object_content_type')
+	holder_type = models.ForeignKey(
+		ContentType,
+		related_name='access_holder',
+		limit_choices_to={'model__in': ('user', 'group', 'role')}
+	)
+	holder_id = models.PositiveIntegerField()
+	holder_object = generic.GenericForeignKey(
+		ct_field='holder_type',
+		fk_field='holder_id'
+	)
+
+	content_type = models.ForeignKey(
+		ContentType,
+		related_name='object_content_type'
+	)
 	object_id = models.PositiveIntegerField()
-	content_object = generic.GenericForeignKey(ct_field='content_type', fk_field='object_id')
+	content_object = generic.GenericForeignKey(
+		ct_field='content_type',
+		fk_field='object_id'
+	)
 
 	objects = AccessEntryManager()