Remove app specific ACL new holder links, urls and views

apps/folders/__init__.py

@@ -25,14 +25,11 @@ folder_add_document = {'text': _('add to a folder'), 'view': 'folder_add_documen
 document_folder_list = {'text': _(u'folders'), 'view': 'document_folder_list', 'args': 'object.pk', 'famfam': 'folder_user', 'permissions': [PERMISSION_DOCUMENT_VIEW], 'children_view_regex': [r'folder']}
 
 folder_acl_list = {'text': _(u'ACLs'), 'view': 'folder_acl_list', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]}
-folder_new_holder = {'text': _(u'New holder'), 'view': 'folder_new_holder', 'args': 'object.pk', 'famfam': 'user', 'permissions': [ACLS_VIEW_ACL]}
 
 register_multi_item_links(['folder_view'], [folder_document_multiple_remove])
 
 register_links(Folder, [folder_view, folder_edit, folder_delete, folder_acl_list])
 
-register_links(['folder_acl_list', 'folder_new_holder'], [folder_new_holder], menu_name='sidebar')
-
 register_links([Folder, 'folder_list', 'folder_create'], [folder_list, folder_create], menu_name='secondary_menu')
 
 register_top_menu(name='folders', link={'text': _('folders'), 'famfam': 'folder_user', 'view': 'folder_list'}, children_views=['folder_list', 'folder_create', 'folder_edit', 'folder_delete', 'folder_view', 'folder_document_multiple_remove'])

apps/folders/urls.py

@@ -13,5 +13,4 @@ urlpatterns = patterns('folders.views',
     url(r'^document/(?P<document_id>\d+)/folder/list/$', 'document_folder_list', (), 'document_folder_list'),
     
     url(r'^(?P<folder_pk>\d+)/acl/list/$', 'folder_acl_list', (), 'folder_acl_list'),
-    url(r'^(?P<folder_pk>\d+)/acl/holder/new/$', 'folder_new_holder', (), 'folder_new_holder'),    
 )

apps/folders/views.py

@@ -17,7 +17,7 @@ from documents.views import document_list
 from permissions import Permission
 from common.utils import encapsulate
 from acls.models import AccessEntry
-from acls.views import acl_list_for, acl_new_holder_for
+from acls.views import acl_list_for
 
 from .models import Folder, FolderDocument
 from .forms import FolderForm, FolderListForm
@@ -291,17 +291,3 @@ def folder_acl_list(request, folder_pk):
             'object': folder,
         }
     )
-
-
-def folder_new_holder(request, folder_pk):
-    folder = get_object_or_404(Folder, pk=folder_pk)
-    return acl_new_holder_for(
-        request,
-        folder,
-        extra_context={
-            'folder': folder,
-            'submit_label': _(u'Select'),
-            'submit_icon_famfam': 'tick',
-            'object': folder,       
-        }
-    )