Commit 15551301 authored by Romain Courteaud's avatar Romain Courteaud

Overload _properties from OFS/Folder, because it was used in accessor generation.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13408 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2008a777
...@@ -43,10 +43,9 @@ from Products.ERP5Type.Utils import sortValueList ...@@ -43,10 +43,9 @@ from Products.ERP5Type.Utils import sortValueList
try: try:
from Products.CMFCore.CMFBTreeFolder import CMFBTreeFolder from Products.CMFCore.CMFBTreeFolder import CMFBTreeFolder
from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2Base
except ImportError: except ImportError:
from Products.BTreeFolder2.CMFBTreeFolder import CMFBTreeFolder from Products.BTreeFolder2.CMFBTreeFolder import CMFBTreeFolder
from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2Base from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2Base
from AccessControl import getSecurityManager from AccessControl import getSecurityManager
from Products.ERP5Type import Permissions from Products.ERP5Type import Permissions
from random import randint from random import randint
...@@ -324,6 +323,11 @@ class Folder( CopyContainer, CMFBTreeFolder, Base, FolderMixIn): ...@@ -324,6 +323,11 @@ class Folder( CopyContainer, CMFBTreeFolder, Base, FolderMixIn):
isPortalContent = 1 isPortalContent = 1
isRADContent = 1 isRADContent = 1
# Overload _properties define in OFS/Folder
# _properties=({'id':'title', 'type': 'string','mode':'wd'},)
# because it conflicts with title accessor generation
_properties=()
# Declarative security # Declarative security
security = ClassSecurityInfo() security = ClassSecurityInfo()
security.declareObjectProtected(Permissions.AccessContentsInformation) security.declareObjectProtected(Permissions.AccessContentsInformation)
...@@ -346,7 +350,6 @@ class Folder( CopyContainer, CMFBTreeFolder, Base, FolderMixIn): ...@@ -346,7 +350,6 @@ class Folder( CopyContainer, CMFBTreeFolder, Base, FolderMixIn):
_setPropValue = Base._setPropValue _setPropValue = Base._setPropValue
_propertyMap = Base._propertyMap # are there any others XXX ? _propertyMap = Base._propertyMap # are there any others XXX ?
# Overload __init__ so that we do not take into account title # Overload __init__ so that we do not take into account title
# This is required for test_23_titleIsNotDefinedByDefault # This is required for test_23_titleIsNotDefinedByDefault
def __init__(self, id): def __init__(self, id):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment