Update apps to new ACL app changes

mayan/apps/linking/apps.py

@@ -3,7 +3,8 @@ from __future__ import unicode_literals
 from django.utils.translation import ugettext_lazy as _
 
 from acls.api import class_permissions
-from acls.permissions import acls_edit_acl, acls_view_acl
+from acls.links import link_acl_list
+from acls.permissions import permission_acl_edit, permission_acl_view
 from common import (
     MayanAppConfig, menu_facet, menu_object, menu_secondary, menu_setup,
     menu_sidebar
@@ -12,13 +13,12 @@ from documents.models import Document
 
 from .classes import ResolvedSmartLink
 from .links import (
-    link_smart_link_acl_list, link_smart_link_create,
-    link_smart_link_condition_create, link_smart_link_condition_delete,
-    link_smart_link_condition_edit, link_smart_link_condition_list,
-    link_smart_link_delete, link_smart_link_document_types,
-    link_smart_link_edit, link_smart_link_instance_view,
-    link_smart_link_instances_for_document, link_smart_link_list,
-    link_smart_link_setup
+    link_smart_link_create, link_smart_link_condition_create,
+    link_smart_link_condition_delete, link_smart_link_condition_edit,
+    link_smart_link_condition_list, link_smart_link_delete,
+    link_smart_link_document_types, link_smart_link_edit,
+    link_smart_link_instance_view, link_smart_link_instances_for_document,
+    link_smart_link_list, link_smart_link_setup
 )
 from .models import SmartLink, SmartLinkCondition
 from .permissions import (
@@ -35,13 +35,14 @@ class LinkingApp(MayanAppConfig):
         super(LinkingApp, self).ready()
 
         class_permissions(SmartLink, [
-            acls_edit_acl, acls_view_acl, permission_smart_link_delete,
-            permission_smart_link_edit, permission_smart_link_view
+            permission_acl_edit, permission_acl_view,
+            permission_smart_link_delete, permission_smart_link_edit,
+            permission_smart_link_view
         ])
 
         menu_facet.bind_links(links=[link_smart_link_instances_for_document], sources=[Document])
         menu_object.bind_links(links=[link_smart_link_condition_edit, link_smart_link_condition_delete], sources=[SmartLinkCondition])
-        menu_object.bind_links(links=[link_smart_link_edit, link_smart_link_document_types, link_smart_link_condition_list, link_smart_link_acl_list, link_smart_link_delete], sources=[SmartLink])
+        menu_object.bind_links(links=[link_smart_link_edit, link_smart_link_document_types, link_smart_link_condition_list, link_acl_list, link_smart_link_delete], sources=[SmartLink])
         menu_object.bind_links(links=[link_smart_link_instance_view], sources=[ResolvedSmartLink])
         menu_secondary.bind_links(links=[link_smart_link_list, link_smart_link_create], sources=[SmartLink, 'linking:smart_link_list', 'linking:smart_link_create'])
         menu_setup.bind_links(links=[link_smart_link_setup])

mayan/apps/linking/links.py

@@ -2,7 +2,6 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from acls.permissions import acls_view_acl
 from documents.permissions import permission_document_view
 from navigation import Link
 
@@ -11,7 +10,6 @@ from .permissions import (
     permission_smart_link_edit, permission_smart_link_view
 )
 
-link_smart_link_acl_list = Link(permissions=[acls_view_acl], text=_('ACLs'), view='linking:smart_link_acl_list', args='object.pk')
 link_smart_link_condition_create = Link(permissions=[permission_smart_link_edit], text=_('Create condition'), view='linking:smart_link_condition_create', args='object.pk')
 link_smart_link_condition_delete = Link(permissions=[permission_smart_link_edit], tags='dangerous', text=_('Delete'), view='linking:smart_link_condition_delete', args='resolved_object.pk')
 link_smart_link_condition_edit = Link(permissions=[permission_smart_link_edit], text=_('Edit'), view='linking:smart_link_condition_edit', args='resolved_object.pk')

mayan/apps/linking/urls.py

@@ -19,6 +19,4 @@ urlpatterns = patterns(
     url(r'^setup/(?P<smart_link_pk>\d+)/condition/create/$', 'smart_link_condition_create', name='smart_link_condition_create'),
     url(r'^setup/smart_link/condition/(?P<smart_link_condition_pk>\d+)/edit/$', 'smart_link_condition_edit', name='smart_link_condition_edit'),
     url(r'^setup/smart_link/condition/(?P<smart_link_condition_pk>\d+)/delete/$', 'smart_link_condition_delete', name='smart_link_condition_delete'),
-
-    url(r'^(?P<smart_link_pk>\d+)/acl/list/$', 'smart_link_acl_list', name='smart_link_acl_list'),
 )

mayan/apps/linking/views.py

@@ -11,8 +11,6 @@ from django.shortcuts import get_object_or_404, render_to_response
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 
-from acls.models import AccessEntry
-from acls.views import acl_list_for
 from common.utils import encapsulate
 from common.views import AssignRemoveView
 from common.widgets import two_state_template
@@ -336,17 +334,3 @@ def smart_link_condition_delete(request, smart_link_condition_pk):
         'previous': previous,
         'title': _('Are you sure you wish to delete smart link condition: "%s"?') % smart_link_condition,
     }, context_instance=RequestContext(request))
-
-
-def smart_link_acl_list(request, smart_link_pk):
-    smart_link = get_object_or_404(SmartLink, pk=smart_link_pk)
-    logger.debug('smart_link: %s', smart_link)
-
-    return acl_list_for(
-        request,
-        smart_link,
-        extra_context={
-            'object': smart_link,
-            'smart_link': smart_link,
-        }
-    )