[Erp5-report] r15788 - in /erp5/trunk/products: ERP5/ ERP5/Tool/ ERP5Catalog/ ERP5Type/Core/
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Aug 22 18:38:27 CEST 2007
Author: jerome
Date: Wed Aug 22 18:38:27 2007
New Revision: 15788
URL: http://svn.erp5.org?rev=15788&view=rev
Log:
don't use the deprecated Products.CMFCore.CMFCorePermissions but
Products.ERP5Type.Permissions instead. ( I only updated ERP5 ERP5Type and
ERP5Catalog )
Modified:
erp5/trunk/products/ERP5/Interaction.py
erp5/trunk/products/ERP5/Tool/InterpolationTool.py
erp5/trunk/products/ERP5Catalog/CatalogTool.py
erp5/trunk/products/ERP5Type/Core/CacheFactory.py
erp5/trunk/products/ERP5Type/Core/DistributedRamCache.py
erp5/trunk/products/ERP5Type/Core/Folder.py
erp5/trunk/products/ERP5Type/Core/RamCache.py
erp5/trunk/products/ERP5Type/Core/SQLCache.py
Modified: erp5/trunk/products/ERP5/Interaction.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Interaction.py?rev=15788&r1=15787&r2=15788&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Interaction.py (original)
+++ erp5/trunk/products/ERP5/Interaction.py Wed Aug 22 18:38:27 2007
@@ -27,7 +27,7 @@
import Globals
from AccessControl import ClassSecurityInfo
-from Products.CMFCore.CMFCorePermissions import ManagePortal
+from Products.ERP5Type.Permissions import ManagePortal
from Products.DCWorkflow.ContainerTab import ContainerTab
from Products.DCWorkflow.Guard import Guard
Modified: erp5/trunk/products/ERP5/Tool/InterpolationTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/InterpolationTool.py?rev=15788&r1=15787&r2=15788&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/InterpolationTool.py (original)
+++ erp5/trunk/products/ERP5/Tool/InterpolationTool.py Wed Aug 22 18:38:27 2007
@@ -26,7 +26,6 @@
#
##############################################################################
-from Products.CMFCore import CMFCorePermissions
from AccessControl import ClassSecurityInfo
from Products.CMFCore.utils import UniqueObject, _checkPermission, _getAuthenticatedUser
from Globals import InitializeClass
Modified: erp5/trunk/products/ERP5Catalog/CatalogTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/CatalogTool.py?rev=15788&r1=15787&r2=15788&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/CatalogTool.py (original)
+++ erp5/trunk/products/ERP5Catalog/CatalogTool.py Wed Aug 22 18:38:27 2007
@@ -29,7 +29,7 @@
from Products.CMFCore.CatalogTool import CatalogTool as CMFCoreCatalogTool
from Products.ZSQLCatalog.ZSQLCatalog import ZCatalog
from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery
-from Products.CMFCore import CMFCorePermissions
+from Products.ERP5Type import Permissions
from AccessControl import ClassSecurityInfo, getSecurityManager
from Products.CMFCore.CatalogTool import IndexableObjectWrapper as CMFCoreIndexableObjectWrapper
from Products.CMFCore.utils import UniqueObject, _checkPermission, _getAuthenticatedUser, getToolByName
@@ -200,7 +200,7 @@
__url = CMFCoreCatalogTool.__url
manage_catalogFind = CMFCoreCatalogTool.manage_catalogFind
- security.declareProtected( CMFCorePermissions.ManagePortal
+ security.declareProtected( Permissions.ManagePortal
, 'manage_schema' )
manage_schema = DTMLFile( 'dtml/manageSchema', globals() )
@@ -552,7 +552,7 @@
limit the results to what the user is allowed to see.
"""
if not _checkPermission(
- CMFCorePermissions.AccessInactivePortalContent, self ):
+ Permissions.AccessInactivePortalContent, self ):
now = DateTime()
kw[ 'effective' ] = { 'query' : now, 'range' : 'max' }
kw[ 'expires' ] = { 'query' : now, 'range' : 'min' }
@@ -604,7 +604,7 @@
"""
# XXX This needs to be set again
#if not _checkPermission(
- # CMFCorePermissions.AccessInactivePortalContent, self ):
+ # Permissions.AccessInactivePortalContent, self ):
# base = aq_base( self )
# now = DateTime()
# #kw[ 'effective' ] = { 'query' : now, 'range' : 'max' }
Modified: erp5/trunk/products/ERP5Type/Core/CacheFactory.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/CacheFactory.py?rev=15788&r1=15787&r2=15788&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/CacheFactory.py (original)
+++ erp5/trunk/products/ERP5Type/Core/CacheFactory.py Wed Aug 22 18:38:27 2007
@@ -28,7 +28,6 @@
from AccessControl import ClassSecurityInfo
-from Products.CMFCore import CMFCorePermissions
from Products.ERP5Type import Permissions
from Products.ERP5Type import PropertySheet
from Products.ERP5Type.PropertySheet.CacheFactory import CacheFactory
@@ -51,7 +50,7 @@
)
security = ClassSecurityInfo()
- security.declareProtected(CMFCorePermissions.ManagePortal,
+ security.declareProtected(Permissions.ManagePortal,
'manage_editProperties',
'manage_changeProperties',
'manage_propertiesForm',
Modified: erp5/trunk/products/ERP5Type/Core/DistributedRamCache.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/DistributedRamCache.py?rev=15788&r1=15787&r2=15788&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/DistributedRamCache.py (original)
+++ erp5/trunk/products/ERP5Type/Core/DistributedRamCache.py Wed Aug 22 18:38:27 2007
@@ -27,9 +27,9 @@
##############################################################################
from AccessControl import ClassSecurityInfo
-from Products.CMFCore import CMFCorePermissions
from Products.ERP5Type.XMLObject import XMLObject
from Products.ERP5Type import PropertySheet
+from Products.ERP5Type import Permissions
from Products.ERP5.PropertySheet.SortIndex import SortIndex
from Products.ERP5Type.PropertySheet.BaseCache import BaseCache
from Products.ERP5Type.PropertySheet.DistributedRamCache import DistributedRamCache
@@ -48,7 +48,7 @@
allowed_types = ()
security = ClassSecurityInfo()
- security.declareProtected(CMFCorePermissions.ManagePortal,
+ security.declareProtected(Permissions.ManagePortal,
'manage_editProperties',
'manage_changeProperties',
'manage_propertiesForm',
Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=15788&r1=15787&r2=15788&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py Wed Aug 22 18:38:27 2007
@@ -33,11 +33,10 @@
from Products.CMFCore.utils import _getAuthenticatedUser
from Products.CMFCore.CMFCatalogAware import CMFCatalogAware
-from Products.CMFCore import CMFCorePermissions
from Products.ERP5Type.Base import Base
from Products.ERP5Type.CopySupport import CopyContainer
-from Products.ERP5Type import PropertySheet, Permissions
+from Products.ERP5Type import PropertySheet
from Products.ERP5Type.XMLExportImport import Folder_asXML
from Products.ERP5Type.Cache import CachingMethod
from Products.ERP5Type.Utils import sortValueList
@@ -954,7 +953,7 @@
object.manage_beforeDelete(object, self)
self._delOb(id)
- security.declareProtected( CMFCorePermissions.ManagePortal, 'callMethodOnObjectList' )
+ security.declareProtected( Permissions.ManagePortal, 'callMethodOnObjectList' )
def callMethodOnObjectList(self, object_path_list, method_id, *args, **kw):
"""
Very usefull if we want to activate the call of a method
Modified: erp5/trunk/products/ERP5Type/Core/RamCache.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/RamCache.py?rev=15788&r1=15787&r2=15788&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/RamCache.py (original)
+++ erp5/trunk/products/ERP5Type/Core/RamCache.py Wed Aug 22 18:38:27 2007
@@ -28,9 +28,9 @@
from AccessControl import ClassSecurityInfo
-from Products.CMFCore import CMFCorePermissions
from Products.ERP5Type.XMLObject import XMLObject
from Products.ERP5Type import PropertySheet
+from Products.ERP5Type import Permissions
from Products.ERP5.PropertySheet.SortIndex import SortIndex
from Products.ERP5Type.PropertySheet.BaseCache import BaseCache
@@ -46,7 +46,7 @@
allowed_types = ()
security = ClassSecurityInfo()
- security.declareProtected(CMFCorePermissions.ManagePortal,
+ security.declareProtected(Permissions.ManagePortal,
'manage_editProperties',
'manage_changeProperties',
'manage_propertiesForm',
Modified: erp5/trunk/products/ERP5Type/Core/SQLCache.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/SQLCache.py?rev=15788&r1=15787&r2=15788&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/SQLCache.py (original)
+++ erp5/trunk/products/ERP5Type/Core/SQLCache.py Wed Aug 22 18:38:27 2007
@@ -27,10 +27,10 @@
##############################################################################
from AccessControl import ClassSecurityInfo
-from Products.CMFCore import CMFCorePermissions
from Products.ERP5Type.Base import Base
from Products.ERP5Type.XMLObject import XMLObject
from Products.ERP5Type import PropertySheet
+from Products.ERP5Type import Permissions
from Products.ERP5.PropertySheet.SortIndex import SortIndex
from Products.ERP5Type.PropertySheet.BaseCache import BaseCache
from Products.ERP5Type.PropertySheet.SQLCache import SQLCache
@@ -49,7 +49,7 @@
allowed_types = ()
security = ClassSecurityInfo()
- security.declareProtected(CMFCorePermissions.ManagePortal,
+ security.declareProtected(Permissions.ManagePortal,
'manage_editProperties',
'manage_changeProperties',
'manage_propertiesForm',
More information about the Erp5-report
mailing list