diff --git a/apps/acls/__init__.py b/apps/acls/__init__.py index 4ed3c5de91..89aaef2adc 100644 --- a/apps/acls/__init__.py +++ b/apps/acls/__init__.py @@ -1,19 +1,14 @@ from __future__ import absolute_import -from django.utils.translation import ugettext_lazy as _ - from navigation.api import register_links, register_multi_item_links from project_setup.api import register_setup from .classes import (AccessHolder, AccessObjectClass, ClassAccessHolder, AccessObject) -from .links import (acl_list, acl_detail, acl_grant, acl_revoke, acl_holder_new, +from .links import (acl_detail, acl_grant, acl_revoke, acl_holder_new, acl_setup_valid_classes, acl_class_list, acl_class_acl_list, acl_class_acl_detail, acl_class_new_holder_for, acl_class_grant, acl_class_revoke) -from .permissions import (ACLS_EDIT_ACL, ACLS_VIEW_ACL, - ACLS_CLASS_EDIT_ACL, ACLS_CLASS_VIEW_ACL) - register_links(AccessHolder, [acl_detail]) register_multi_item_links(['acl_detail'], [acl_grant, acl_revoke]) diff --git a/apps/acls/links.py b/apps/acls/links.py index ff06820d8c..ebd75d414c 100644 --- a/apps/acls/links.py +++ b/apps/acls/links.py @@ -1,11 +1,8 @@ from django.utils.translation import ugettext_lazy as _ -from .classes import (AccessHolder, AccessObjectClass, ClassAccessHolder, - AccessObject) from .permissions import (ACLS_EDIT_ACL, ACLS_VIEW_ACL, ACLS_CLASS_EDIT_ACL, ACLS_CLASS_VIEW_ACL) - acl_list = {'text': _(u'ACLs'), 'view': 'acl_list', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} acl_detail = {'text': _(u'details'), 'view': 'acl_detail', 'args': ['access_object.gid', 'object.gid'], 'famfam': 'key_go', 'permissions': [ACLS_VIEW_ACL]} acl_grant = {'text': _(u'grant'), 'view': 'acl_multiple_grant', 'famfam': 'key_add', 'permissions': [ACLS_EDIT_ACL]}