diff --git a/apps/document_acls/__init__.py b/apps/document_acls/__init__.py index ec449dac37..dc89ed3174 100644 --- a/apps/document_acls/__init__.py +++ b/apps/document_acls/__init__.py @@ -3,8 +3,11 @@ from django.utils.translation import ugettext_lazy as _ from documents.models import Document from navigation.api import register_links, register_multi_item_links from project_setup.api import register_setup +from acls import ACLS_VIEW_ACL -#from acls import ACLS_VIEW_ACL -acl_list = {'text': _(u'ACLs'), 'view': 'document_acl_list', 'args': 'object.pk', 'famfam': 'lock'}#, 'permissions': [ACLS_VIEW_ACL]} +acl_list = {'text': _(u'ACLs'), 'view': 'document_acl_list', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} +document_new_holder = {'text': _(u'New holder'), 'view': 'document_new_holder', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} register_links(Document, [acl_list], menu_name='form_header') + +register_links(['document_acl_list', 'document_new_holder'], [document_new_holder], menu_name='sidebar') diff --git a/apps/document_acls/urls.py b/apps/document_acls/urls.py index ed86e90c81..e86dc9d4fc 100644 --- a/apps/document_acls/urls.py +++ b/apps/document_acls/urls.py @@ -1,5 +1,6 @@ from django.conf.urls.defaults import patterns, url urlpatterns = patterns('document_acls.views', - url(r'^list_for/(?P\d+)/$', 'document_acl_list', (), 'document_acl_list'), + url(r'^list_for/document/(?P\d+)/$', 'document_acl_list', (), 'document_acl_list'), + url(r'^new_holder_for/document/(?P\d+)/$', 'document_new_holder', (), 'document_new_holder'), ) diff --git a/apps/document_acls/views.py b/apps/document_acls/views.py index 4b20a038ee..505770fa99 100644 --- a/apps/document_acls/views.py +++ b/apps/document_acls/views.py @@ -2,7 +2,7 @@ from django.shortcuts import render_to_response, get_object_or_404 from django.utils.translation import ugettext_lazy as _ from documents.models import Document -from acls.views import acl_list_for +from acls.views import acl_list_for, acl_new_holder_for from acls.models import AccessEntry @@ -15,3 +15,14 @@ def document_acl_list(request, document_id): 'object': document, } ) + + +def document_new_holder(request, document_id): + document = get_object_or_404(Document, pk=document_id) + return acl_new_holder_for( + request, + document, + extra_context={ + 'object': document, + } + )