From e5cc2e3f7a8c6a45a6be5809cc00065807259e75 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <Roberto.Rosario.Gonzalez@gmail.com>
Date: Tue, 3 Jan 2012 03:04:32 -0400
Subject: [PATCH] Update the apps to the new acls module split

---
 apps/document_acls/__init__.py | 2 +-
 apps/document_acls/views.py    | 2 --
 apps/documents/__init__.py     | 2 +-
 apps/folders/__init__.py       | 2 +-
 apps/linking/__init__.py       | 2 +-
 apps/metadata/__init__.py      | 2 +-
 apps/sources/__init__.py       | 2 +-
 apps/tags/__init__.py          | 2 +-
 8 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/apps/document_acls/__init__.py b/apps/document_acls/__init__.py
index acafb97d50..ff6d1f32bb 100644
--- a/apps/document_acls/__init__.py
+++ b/apps/document_acls/__init__.py
@@ -4,7 +4,7 @@ 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, ACLS_EDIT_ACL
-from acls.models import class_permissions
+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]}
diff --git a/apps/document_acls/views.py b/apps/document_acls/views.py
index 5f723f166e..505770fa99 100644
--- a/apps/document_acls/views.py
+++ b/apps/document_acls/views.py
@@ -24,7 +24,5 @@ def document_new_holder(request, document_id):
 		document,
 		extra_context={
 			'object': document,
-            'submit_label': _(u'Select'),
-            'submit_icon_famfam': 'tick'            
 		}
 	)
diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py
index 1629fe63af..0c9ce41042 100644
--- a/apps/documents/__init__.py
+++ b/apps/documents/__init__.py
@@ -13,7 +13,7 @@ from tags.widgets import get_tags_inline_widget_simple
 from history.api import register_history_type
 from metadata.api import get_metadata_string
 from project_setup.api import register_setup
-from acls.models import class_permissions
+from acls.api import class_permissions
 
 from .models import (Document, DocumentPage,
     DocumentPageTransformation, DocumentType, DocumentTypeFilename,
diff --git a/apps/folders/__init__.py b/apps/folders/__init__.py
index 5c894224be..0a89298148 100644
--- a/apps/folders/__init__.py
+++ b/apps/folders/__init__.py
@@ -6,7 +6,7 @@ from navigation.api import (register_links, register_top_menu,
     register_multi_item_links, register_sidebar_template)
 from documents.models import Document
 from documents.permissions import PERMISSION_DOCUMENT_VIEW
-from acls.models import class_permissions
+from acls.api import class_permissions
 from acls import ACLS_EDIT_ACL, ACLS_VIEW_ACL
 
 from .models import Folder
diff --git a/apps/linking/__init__.py b/apps/linking/__init__.py
index 73e4b1cecb..0354346f7e 100644
--- a/apps/linking/__init__.py
+++ b/apps/linking/__init__.py
@@ -6,7 +6,7 @@ from navigation.api import register_links, register_sidebar_template
 from project_setup.api import register_setup
 from documents.permissions import PERMISSION_DOCUMENT_VIEW
 from documents.models import Document
-from acls.models import class_permissions
+from acls.api import class_permissions
 from acls import ACLS_EDIT_ACL, ACLS_VIEW_ACL
 
 from .models import SmartLink, SmartLinkCondition
diff --git a/apps/metadata/__init__.py b/apps/metadata/__init__.py
index 60439c2924..97f5de443a 100644
--- a/apps/metadata/__init__.py
+++ b/apps/metadata/__init__.py
@@ -7,7 +7,7 @@ from navigation.api import register_links, register_multi_item_links, \
 from documents.models import Document, DocumentType
 from documents.permissions import PERMISSION_DOCUMENT_TYPE_EDIT
 from project_setup.api import register_setup
-from acls.models import class_permissions
+from acls.api import class_permissions
 
 from .models import MetadataType, MetadataSet
 from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT,
diff --git a/apps/sources/__init__.py b/apps/sources/__init__.py
index 8fc456eef5..ecdbe086a5 100644
--- a/apps/sources/__init__.py
+++ b/apps/sources/__init__.py
@@ -9,7 +9,7 @@ from common.utils import encapsulate
 from project_setup.api import register_setup
 from documents.models import Document
 from documents.permissions import PERMISSION_DOCUMENT_CREATE
-from acls.models import class_permissions
+from acls.api import class_permissions
 
 from .staging import StagingFile
 from .models import (WebForm, StagingFolder, SourceTransformation,
diff --git a/apps/tags/__init__.py b/apps/tags/__init__.py
index cb9edd1fb0..357b4b878c 100644
--- a/apps/tags/__init__.py
+++ b/apps/tags/__init__.py
@@ -6,7 +6,7 @@ from navigation.api import (register_links, register_top_menu,
     register_model_list_columns, register_multi_item_links)
 from common.utils import encapsulate
 from documents.models import Document
-from acls.models import class_permissions
+from acls.api import class_permissions
 from acls.permissions import ACLS_VIEW_ACL
 
 from taggit.models import Tag