Skip to content

erp5
erp5
Commit bc634b05 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

rename keyword strict to strict_membership in category membership generated methods. (Bug #42) 


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@3293 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b124000a
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 24 deletions
product/ERP5Type/Accessor/RelatedValue.py
View file @ bc634b05
...@@ -43,6 +43,8 @@ class DefaultGetter(Method): ...@@ -43,6 +43,8 @@ class DefaultGetter(Method):
func_defaults = () func_defaults = ()
def __init__(self, id, key, warning=0): def __init__(self, id, key, warning=0):
""" 'warning' argument means that this category is deprecated in the
property sheet, so the generated method will also be deprecated """
self._id = id self._id = id
self.__name__ = id self.__name__ = id
self._key = key self._key = key
...@@ -52,9 +54,11 @@ class DefaultGetter(Method): ...@@ -52,9 +54,11 @@ class DefaultGetter(Method):
if self._warning: if self._warning:
LOG("ERP5Type Deprecated Getter Id:",0, self._id) LOG("ERP5Type Deprecated Getter Id:",0, self._id)
return instance._getDefaultRelatedValue(self._key, return instance._getDefaultRelatedValue(self._key,
spec=kw.get('spec',()), spec=kw.get('spec',()),
filter=kw.get('filter', None), filter=kw.get('filter', None),
portal_type=kw.get('portal_type',())) portal_type=kw.get('portal_type',()),
strict_membership=kw.get('strict_membership',
kw.get('strict', None))) # 'strict' is deprecated
psyco.bind(__call__) psyco.bind(__call__)
...@@ -74,6 +78,8 @@ class ListGetter(Method): ...@@ -74,6 +78,8 @@ class ListGetter(Method):
func_defaults = () func_defaults = ()
def __init__(self, id, key, warning=0): def __init__(self, id, key, warning=0):
""" 'warning' argument means that this category is deprecated in the
property sheet, so the generated method will also be deprecated """
self._id = id self._id = id
self.__name__ = id self.__name__ = id
self._key = key self._key = key
...@@ -83,9 +89,11 @@ class ListGetter(Method): ...@@ -83,9 +89,11 @@ class ListGetter(Method):
if self._warning: if self._warning:
LOG("ERP5Type Deprecated Getter Id:",0, self._id) LOG("ERP5Type Deprecated Getter Id:",0, self._id)
return instance._getRelatedValueList(self._key, return instance._getRelatedValueList(self._key,
spec=kw.get('spec',()), spec=kw.get('spec',()),
filter=kw.get('filter', None), filter=kw.get('filter', None),
portal_type=kw.get('portal_type',())) portal_type=kw.get('portal_type',()),
strict_membership=kw.get('strict_membership',
kw.get('strict', None))) # 'strict' is deprecated
psyco.bind(__call__) psyco.bind(__call__)
...@@ -116,7 +124,10 @@ class DefaultIdGetter(Method): ...@@ -116,7 +124,10 @@ class DefaultIdGetter(Method):
return instance._getDefaultRelatedProperty(self._key, 'id', return instance._getDefaultRelatedProperty(self._key, 'id',
spec=kw.get('spec',()), spec=kw.get('spec',()),
filter=kw.get('filter', None), filter=kw.get('filter', None),
portal_type=kw.get('portal_type',())) portal_type=kw.get('portal_type',()),
strict_membership=kw.get('strict_membership',
kw.get('strict', None))) # 'strict' is deprecated
psyco.bind(__call__) psyco.bind(__call__)
...@@ -145,9 +156,11 @@ class IdListGetter(Method): ...@@ -145,9 +156,11 @@ class IdListGetter(Method):
if self._warning: if self._warning:
LOG("ERP5Type Deprecated Getter Id:",0, self._id) LOG("ERP5Type Deprecated Getter Id:",0, self._id)
return instance._getRelatedPropertyList(self._key, 'id', return instance._getRelatedPropertyList(self._key, 'id',
spec=kw.get('spec',()), spec=kw.get('spec',()),
filter=kw.get('filter', None), filter=kw.get('filter', None),
portal_type=kw.get('portal_type',())) portal_type=kw.get('portal_type',()),
strict_membership=kw.get('strict_membership',
kw.get('strict', None))) # 'strict' is deprecated
psyco.bind(__call__) psyco.bind(__call__)
...@@ -178,7 +191,10 @@ class DefaultTitleGetter(Method): ...@@ -178,7 +191,10 @@ class DefaultTitleGetter(Method):
return instance._getDefaultRelatedProperty(self._key, 'title', return instance._getDefaultRelatedProperty(self._key, 'title',
spec=kw.get('spec',()), spec=kw.get('spec',()),
filter=kw.get('filter', None), filter=kw.get('filter', None),
portal_type=kw.get('portal_type',())) portal_type=kw.get('portal_type',(),
strict_membership=kw.get('strict_membership',
kw.get('strict', None))) # 'strict' is deprecated
psyco.bind(__call__) psyco.bind(__call__)
...@@ -209,8 +225,9 @@ class TitleListGetter(Method): ...@@ -209,8 +225,9 @@ class TitleListGetter(Method):
return instance._getRelatedPropertyList(self._key, 'title', return instance._getRelatedPropertyList(self._key, 'title',
spec=kw.get('spec',()), spec=kw.get('spec',()),
filter=kw.get('filter', None), filter=kw.get('filter', None),
portal_type=kw.get('portal_type',())) portal_type=kw.get('portal_type',()),
strict_membership=kw.get('strict_membership',
kw.get('strict', None))) # 'strict' is deprecated
psyco.bind(__call__) psyco.bind(__call__)
TitleSetGetter = TitleListGetter # XXX Error TitleSetGetter = TitleListGetter # XXX Error
...@@ -240,8 +257,9 @@ class DefaultPropertyGetter(Method): ...@@ -240,8 +257,9 @@ class DefaultPropertyGetter(Method):
return instance._getDefaultRelatedProperty(self._key, key, return instance._getDefaultRelatedProperty(self._key, key,
spec=kw.get('spec',()), spec=kw.get('spec',()),
filter=kw.get('filter', None), filter=kw.get('filter', None),
portal_type=kw.get('portal_type',())) portal_type=kw.get('portal_type',()),
strict_membership=kw.get('strict_membership',
kw.get('strict', None))) # 'strict' is deprecated
psyco.bind(__call__) psyco.bind(__call__)
PropertyGetter = DefaultPropertyGetter PropertyGetter = DefaultPropertyGetter
...@@ -271,8 +289,9 @@ class PropertyListGetter(Method): ...@@ -271,8 +289,9 @@ class PropertyListGetter(Method):
return instance._getRelatedPropertyList(self._key, key, return instance._getRelatedPropertyList(self._key, key,
spec=kw.get('spec',()), spec=kw.get('spec',()),
filter=kw.get('filter', None), filter=kw.get('filter', None),
portal_type=kw.get('portal_type',())) portal_type=kw.get('portal_type',()),
strict_membership=kw.get('strict_membership',
kw.get('strict', None))) # 'strict' is deprecated
psyco.bind(__call__) psyco.bind(__call__)
PropertySetGetter = PropertyListGetter # Error XXX PropertySetGetter = PropertyListGetter # Error XXX
product/ERP5Type/Base.py
View file @ bc634b05
...@@ -1192,21 +1192,30 @@ class Base( CopyContainer, PortalContent, ActiveObject, ERP5PropertyManager ): ...@@ -1192,21 +1192,30 @@ class Base( CopyContainer, PortalContent, ActiveObject, ERP5PropertyManager ):
getAcquiredValueList = _getAcquiredValueList getAcquiredValueList = _getAcquiredValueList
security.declareProtected( Permissions.View, '_getDefaultRelatedValue' ) security.declareProtected( Permissions.View, '_getDefaultRelatedValue' )
def _getDefaultRelatedValue(self, id, spec=(), filter=None, portal_type=(), strict=0): def _getDefaultRelatedValue(self, id, spec=(), filter=None, portal_type=(),
value_list =self._getRelatedValueList(id, spec=spec, filter=filter, portal_type=portal_type, strict=strict) strict_membership=0, strict="deprecated"):
# backward compatibility to keep strict keyword working
if strict != "deprecated" : strict_membership = strict
value_list =self._getRelatedValueList(id, spec=spec, filter=filter,
portal_type=portal_type,
strict_membership=strict_membership)
try: try:
return value_list[0] return value_list[0]
except: except IndexError:
return None return None
security.declareProtected( Permissions.View, 'getDefaultRelatedValue' ) security.declareProtected( Permissions.View, 'getDefaultRelatedValue' )
getDefaultRelatedValue = _getDefaultRelatedValue getDefaultRelatedValue = _getDefaultRelatedValue
security.declareProtected( Permissions.View, '_getRelatedValueList' ) security.declareProtected( Permissions.View, '_getRelatedValueList' )
def _getRelatedValueList(self, id, spec=(), filter=None, portal_type=(), strict=0): def _getRelatedValueList(self, id, spec=(), filter=None, portal_type=(),
return self._getCategoryTool().getRelatedValueList(self, id, strict_membership=0, strict="deprecated"):
spec=spec, filter=filter, portal_type=portal_type, strict=strict) # backward compatibility to keep strict keyword working
if strict != "deprecated" : strict_membership = strict
return self._getCategoryTool().getRelatedValueList(self, id,
spec=spec, filter=filter, portal_type=portal_type,
strict_membership=strict_membership)
security.declareProtected( Permissions.View, 'getRelatedValueList' ) security.declareProtected( Permissions.View, 'getRelatedValueList' )
getRelatedValueList = _getRelatedValueList getRelatedValueList = _getRelatedValueList
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7