Commit a7e7632c authored by Fabien Morin's avatar Fabien Morin

fix typo, thanks to yusei


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28273 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d97d01f5
...@@ -292,7 +292,7 @@ class TradeCondition(Path, Transformation, XMLMatrix): ...@@ -292,7 +292,7 @@ class TradeCondition(Path, Transformation, XMLMatrix):
security.declareProtected(Permissions.AccessContentsInformation, security.declareProtected(Permissions.AccessContentsInformation,
'findEffectiveSpecialiseValueList') 'findEffectiveSpecialiseValueList')
def findEffectiveSpecialiseValueList(self, context, start_date=None, def findEffectiveSpecialiseValueList(self, context, start_date=None,
stop_date=None, portal_type_list=None, effecive_model_list=None): stop_date=None, portal_type_list=None, effective_model_list=None):
'''Return a list of effective specialised objects that is the '''Return a list of effective specialised objects that is the
inheritance tree. inheritance tree.
An effective object is an object which have start_date and stop_date An effective object is an object which have start_date and stop_date
...@@ -305,8 +305,8 @@ class TradeCondition(Path, Transformation, XMLMatrix): ...@@ -305,8 +305,8 @@ class TradeCondition(Path, Transformation, XMLMatrix):
if start_date is None and stop_date is None: if start_date is None and stop_date is None:
# if dates are not defined, return findSpecialiseValueList result # if dates are not defined, return findSpecialiseValueList result
return self.findSpecialiseValueList(context=context) return self.findSpecialiseValueList(context=context)
if effecive_model_list is None: if effective_model_list is None:
effecive_model_list = [] effective_model_list = []
visited_trade_condition_list = [] visited_trade_condition_list = []
if portal_type_list is None: if portal_type_list is None:
portal_type_list = [self.getPortalType()] portal_type_list = [self.getPortalType()]
...@@ -315,21 +315,21 @@ class TradeCondition(Path, Transformation, XMLMatrix): ...@@ -315,21 +315,21 @@ class TradeCondition(Path, Transformation, XMLMatrix):
effective_model = context.getEffectiveModel( effective_model = context.getEffectiveModel(
start_date=start_date, stop_date=stop_date) start_date=start_date, stop_date=stop_date)
if effective_model is not None: if effective_model is not None:
effecive_model_list = [effective_model] effective_model_list = [effective_model]
visited_trade_condition_list = [effective_model] visited_trade_condition_list = [effective_model]
else: else:
model_list = context.getSpecialiseValueList(\ model_list = context.getSpecialiseValueList(\
portal_type=portal_type_list) portal_type=portal_type_list)
effecive_model_list = [model.getEffectiveModel(\ effective_model_list = [model.getEffectiveModel(\
start_date=start_date, stop_date=stop_date) for model in\ start_date=start_date, stop_date=stop_date) for model in\
model_list] model_list]
visited_trade_condition_list = [model.getEffectiveModel(\ visited_trade_condition_list = [model.getEffectiveModel(\
start_date=start_date, stop_date=stop_date) for model in\ start_date=start_date, stop_date=stop_date) for model in\
model_list] model_list]
# remove None models # remove None models
effecive_model_list = [ob for ob in effecive_model_list if ob is not None] effective_model_list = [ob for ob in effective_model_list if ob is not None]
while len(effecive_model_list) != 0: while len(effective_model_list) != 0:
specialise = effecive_model_list.pop(0) specialise = effective_model_list.pop(0)
effective_specialise = specialise.getEffectiveModel(start_date=start_date, effective_specialise = specialise.getEffectiveModel(start_date=start_date,
stop_date=stop_date) stop_date=stop_date)
child_list = [] child_list = []
...@@ -345,7 +345,7 @@ class TradeCondition(Path, Transformation, XMLMatrix): ...@@ -345,7 +345,7 @@ class TradeCondition(Path, Transformation, XMLMatrix):
if effective_model not in intersection: if effective_model not in intersection:
# don't add model that are already been visited. This permit to # don't add model that are already been visited. This permit to
# visit all model tree, and to not have circular dependency # visit all model tree, and to not have circular dependency
effecive_model_list.append(effective_model) effective_model_list.append(effective_model)
visited_trade_condition_list.append(effective_model) visited_trade_condition_list.append(effective_model)
return visited_trade_condition_list return visited_trade_condition_list
......
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