Remove app specific ACL new holder links, urls and views

This commit is contained in:
Roberto Rosario
2012-01-09 06:42:35 -04:00
parent 351784a210
commit c330c422b7
12 changed files with 17 additions and 85 deletions

View File

@@ -7,12 +7,9 @@ from acls import ACLS_VIEW_ACL, ACLS_EDIT_ACL
from acls.api import class_permissions
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': 'user', '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')
class_permissions(Document, [
ACLS_VIEW_ACL,
ACLS_EDIT_ACL

View File

@@ -2,5 +2,4 @@ from django.conf.urls.defaults import patterns, url
urlpatterns = patterns('document_acls.views',
url(r'^list_for/document/(?P<document_id>\d+)/$', 'document_acl_list', (), 'document_acl_list'),
url(r'^new_holder_for/document/(?P<document_id>\d+)/$', 'document_new_holder', (), 'document_new_holder'),
)

View File

@@ -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, acl_new_holder_for
from acls.views import acl_list_for
from acls.models import AccessEntry
@@ -15,14 +15,3 @@ 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,
}
)