[CMF-checkins] CVS: CMF/CMFWorkspaces - permissions.py:1.2 OrganizationTool.py:1.8 Workspace.py:1.11 __init__.py:1.5

[Tres Seaver]

Update of /cvs-repository/CMF/CMFWorkspaces
In directory cvs.zope.org:/tmp/cvs-serv25166/CMFWorkspaces

Modified Files:
	OrganizationTool.py Workspace.py __init__.py 
Added Files:
	permissions.py 
Log Message:
 - Merge tseaver-permissiongeddon-branch.


=== CMF/CMFWorkspaces/permissions.py 1.1 => 1.2 ===
--- /dev/null	Thu Apr 29 12:13:53 2004
+++ CMF/CMFWorkspaces/permissions.py	Thu Apr 29 12:13:23 2004
@@ -0,0 +1,19 @@
+""" CMFWorkspace product permissions
+
+$Id$
+"""
+from AccessControl import ModuleSecurityInfo
+
+security = ModuleSecurityInfo('Products.CMFWorkspace.permissions')
+
+security.declarePublic('AddPortalFolders')
+from Products.CMFCore.permissions import AddPortalFolders
+
+security.declarePublic('ManagePortal')
+from Products.CMFCore.permissions import ManagePortal
+
+security.declarePublic('View')
+from Products.CMFCore.permissions import View
+
+security.declarePublic('ManageWorkspaces')
+ManageWorkspaces = 'Manage Workspaces'


=== CMF/CMFWorkspaces/OrganizationTool.py 1.7 => 1.8 ===
--- CMF/CMFWorkspaces/OrganizationTool.py:1.7	Tue Feb 18 15:12:41 2003
+++ CMF/CMFWorkspaces/OrganizationTool.py	Thu Apr 29 12:13:23 2004
@@ -24,17 +24,20 @@
 
 $Id$
 """
-
 import os
 from urllib import quote
 
-from Acquisition import aq_inner, aq_parent
-from Globals import InitializeClass, DTMLFile
-from Products.PageTemplates.PageTemplateFile import PageTemplateFile
+from Acquisition import aq_inner
+from Acquisition import aq_parent
+from Globals import InitializeClass
+from Globals import DTMLFile
 from OFS.SimpleItem import SimpleItem
 from AccessControl import ClassSecurityInfo
+from Products.PageTemplates.PageTemplateFile import PageTemplateFile
+
 from Products.CMFCore.utils import UniqueObject, getToolByName
-from Products.CMFCore.CMFCorePermissions import ManagePortal
+
+from permissions import ManagePortal
 
 _wwwdir = os.path.join(os.path.dirname(__file__), 'www') 
 


=== CMF/CMFWorkspaces/Workspace.py 1.10 => 1.11 ===
--- CMF/CMFWorkspaces/Workspace.py:1.10	Fri May  9 17:40:25 2003
+++ CMF/CMFWorkspaces/Workspace.py	Thu Apr 29 12:13:23 2004
@@ -44,16 +44,19 @@
 import Globals
 import webdav
 from DateTime import DateTime
-from AccessControl import ClassSecurityInfo, User, getSecurityManager
+from AccessControl import ClassSecurityInfo
+from AccessControl import User
+from AccessControl import getSecurityManager
+
 from Products.CMFCore import PortalContent
-from Products.CMFCore.CMFCorePermissions import View
 from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
 
 from References import ReferenceCollection
+from permissions import View
+from permissions import ManageWorkspaces
 
 
 # Permission name
-ManageWorkspaces = 'Manage Workspaces'
 
 
 factory_type_information = (


=== CMF/CMFWorkspaces/__init__.py 1.4 => 1.5 ===
--- CMF/CMFWorkspaces/__init__.py:1.4	Sat Aug  3 23:51:56 2002
+++ CMF/CMFWorkspaces/__init__.py	Thu Apr 29 12:13:23 2004
@@ -20,9 +20,10 @@
 
 from Products.CMFCore import utils
 from Products.CMFCore.DirectoryView import registerDirectory
-from Products.CMFCore.CMFCorePermissions import AddPortalFolders
 
-import Workspace, OrganizationTool
+import Workspace
+import OrganizationTool
+from permissions import AddPortalFolders
 
 
 registerDirectory('skins', globals())