Cleanups, permissions separation into explicit module, absolute import update

apps/acls/admin.py

@@ -1,10 +1,12 @@
+from __future__ import absolute_import
+
 from django.contrib import admin
-
-from acls.models import AccessEntry
-
 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
 
+from .models import AccessEntry
+
+
 #class PermissionHolderInline(admin.StackedInline):
 #    model = PermissionHolder
 #    extra = 1

apps/acls/forms.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.models import User, Group
@@ -5,7 +7,7 @@ from django.contrib.auth.models import User, Group
 from permissions.models import Permission, Role
 from common.utils import generate_choices_w_labels, encapsulate, get_object_name
 
-from acls.models import AccessHolder
+from .models import AccessHolder
 
 
 def _as_choice_list(holders):

apps/acls/models.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import sys
 import types
 import logging

apps/acls/permissions.py

@@ -0,0 +1,14 @@
+from __future__ import absolute_import
+
+from django.utils.translation import ugettext_lazy as _
+
+from permissions.models import PermissionNamespace, Permission
+
+acls_namespace = PermissionNamespace('acls', _(u'Access control lists'))
+acls_setup_namespace = PermissionNamespace('acls_setup', _(u'Access control lists'))
+
+ACLS_EDIT_ACL = Permission.objects.register(acls_namespace, 'acl_edit', _(u'Edit ACLs'))
+ACLS_VIEW_ACL = Permission.objects.register(acls_namespace, 'acl_view', _(u'View ACLs'))
+
+ACLS_CLASS_EDIT_ACL = Permission.objects.register(acls_setup_namespace, 'acl_class_edit', _(u'Edit class default ACLs'))
+ACLS_CLASS_VIEW_ACL = Permission.objects.register(acls_setup_namespace, 'acl_class_view', _(u'View class default ACLs'))

apps/acls/widgets.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.utils.translation import ugettext_lazy as _
 from django.utils.safestring import mark_safe
 from django import forms
@@ -8,7 +10,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.db.models.base import ModelBase
 from django.template.defaultfilters import capfirst
 
-from acls.literals import CONTENT_TYPE_ICON_MAP
+from .literals import CONTENT_TYPE_ICON_MAP
 
 
 def content_type_icon(content_type):