[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - folder_contents_control.py:1.7 folder_rename_control.py:1.5 join_control.py:1.5

[Tres Seaver]

Update of /cvs-repository/CMF/CMFDefault/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv25166/CMFDefault/skins/zpt_generic

Modified Files:
	folder_contents_control.py folder_rename_control.py 
	join_control.py 
Log Message:
 - Merge tseaver-permissiongeddon-branch.


=== CMF/CMFDefault/skins/zpt_generic/folder_contents_control.py 1.6 => 1.7 ===
--- CMF/CMFDefault/skins/zpt_generic/folder_contents_control.py:1.6	Thu Apr 15 09:42:59 2004
+++ CMF/CMFDefault/skins/zpt_generic/folder_contents_control.py	Thu Apr 29 12:13:20 2004
@@ -9,21 +9,23 @@
 ##
 from ZTUtils import Batch
 from ZTUtils import make_query
-from Products.CMFCore.CMFCoreExceptions import CopyError
-from Products.CMFCore.CMFCoreExceptions import zExceptions_Unauthorized
-from Products.CMFCore.CMFCorePermissions import AddPortalContent
-from Products.CMFCore.CMFCorePermissions import DeleteObjects
-from Products.CMFCore.CMFCorePermissions import ListFolderContents
-from Products.CMFCore.CMFCorePermissions import ManageProperties
-from Products.CMFCore.CMFCorePermissions import ViewManagementScreens
 from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.exceptions import CopyError
+from Products.CMFDefault.exceptions import zExceptions_Unauthorized
+from Products.CMFDefault.permissions import AddPortalContent
+from Products.CMFDefault.permissions import DeleteObjects
+from Products.CMFDefault.permissions import ListFolderContents
+from Products.CMFDefault.permissions import ManageProperties
+from Products.CMFDefault.permissions import ViewManagementScreens
 from Products.CMFDefault.utils import html_marshal
+
 mtool = getToolByName(script, 'portal_membership')
 utool = getToolByName(script, 'portal_url')
 portal_url = utool()
 target_action = 'object/folderContents'
 status = ''
 message = ''
+
 if not key:
     (key, reverse) = context.getDefaultSorting()
     is_default = 1


=== CMF/CMFDefault/skins/zpt_generic/folder_rename_control.py 1.4 => 1.5 ===
--- CMF/CMFDefault/skins/zpt_generic/folder_rename_control.py:1.4	Thu Apr 15 09:42:59 2004
+++ CMF/CMFDefault/skins/zpt_generic/folder_rename_control.py	Thu Apr 29 12:13:20 2004
@@ -8,9 +8,10 @@
 ##title=
 ##
 from ZTUtils import make_query
-from Products.CMFCore.CMFCoreExceptions import CopyError
 from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.exceptions import CopyError
 from Products.CMFDefault.utils import html_marshal
+
 utool = getToolByName(script, 'portal_url')
 portal_url = utool()
 target_action = 'object/folderContents'


=== CMF/CMFDefault/skins/zpt_generic/join_control.py 1.4 => 1.5 ===
--- CMF/CMFDefault/skins/zpt_generic/join_control.py:1.4	Sun Jan 11 07:59:02 2004
+++ CMF/CMFDefault/skins/zpt_generic/join_control.py	Thu Apr 29 12:13:20 2004
@@ -7,8 +7,9 @@
 ##parameters=member_id='', member_email='', password='', confirm='', send_password='', add='', cancel=''
 ##title=
 ##
-from Products.CMFCore.CMFCorePermissions import ManageUsers
 from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.permissions import ManageUsers
+
 mtool = getToolByName(script, 'portal_membership')
 ptool = getToolByName(script, 'portal_properties')
 rtool = getToolByName(script, 'portal_registration')