Remove DefaultAccessControlList support

mayan/apps/permissions/models.py

@@ -12,8 +12,6 @@ from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext
 from django.utils.translation import ugettext_lazy as _
 
-#from common.models import AnonymousUserSingleton
-
 from .managers import RoleMemberManager, StoredPermissionManager
 
 logger = logging.getLogger(__name__)
@@ -94,24 +92,6 @@ class StoredPermission(models.Model):
             return True
 
 
-"""
-@python_2_unicode_compatible
-class PermissionHolder(models.Model):
-    permission = models.ForeignKey(StoredPermission, verbose_name=_('Permission'))
-    holder_type = models.ForeignKey(ContentType,
-                                    related_name='permission_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')
-
-    class Meta:
-        verbose_name = _('Permission holder')
-        verbose_name_plural = _('Permission holders')
-
-    def __str__(self):
-        return '%s: %s' % (self.holder_type, self.holder_object)
-"""
-
 @python_2_unicode_compatible
 class Role(models.Model):
     name = models.CharField(max_length=64, unique=True)
@@ -129,50 +109,3 @@ class Role(models.Model):
 
     def get_absolute_url(self):
         return reverse('permissions:role_list')
-
-    """
-    def add_member(self, member):
-        member = AnonymousUserSingleton.objects.passthru_check(member)
-        role_member, created = RoleMember.objects.get_or_create(
-            role=self,
-            member_type=ContentType.objects.get_for_model(member),
-            member_id=member.pk)
-        if not created:
-            raise Exception('Unable to add member to role')
-
-    def remove_member(self, member):
-        member = AnonymousUserSingleton.objects.passthru_check(member)
-        member_type = ContentType.objects.get_for_model(member)
-        role_member = RoleMember.objects.get(role=self, member_type=member_type, member_id=member.pk)
-        role_member.delete()
-
-    def members(self, filter_dict=None):
-        filter_dict = filter_dict or {}
-        return (member.member_object for member in self.rolemember_set.filter(**filter_dict))
-    """
-
-    """
-@python_2_unicode_compatible
-class RoleMember(models.Model):
-    role = models.ForeignKey(Role, verbose_name=_('Role'))
-    member_type = models.ForeignKey(
-        ContentType,
-        related_name='role_member',
-        limit_choices_to={
-            'model__in': (
-                'user', 'group', 'anonymoususersingleton'
-            )
-        }
-    )
-    member_id = models.PositiveIntegerField()
-    member_object = generic.GenericForeignKey(ct_field='member_type', fk_field='member_id')
-
-    objects = RoleMemberManager()
-
-    class Meta:
-        verbose_name = _('Role member')
-        verbose_name_plural = _('Role members')
-
-    def __str__(self):
-        return unicode(self.member_object)
-    """