Commit bef0144c authored by wenjie.zheng's avatar wenjie.zheng Committed by Sebastien Robin

Base.py: deploy interaction trigger method id getter.

parent 962c9cd7
...@@ -592,6 +592,7 @@ def initializePortalTypeDynamicWorkflowMethods(ptype_klass, portal_workflow): ...@@ -592,6 +592,7 @@ def initializePortalTypeDynamicWorkflowMethods(ptype_klass, portal_workflow):
for wf_id, v in interaction_workflow_dict.iteritems(): for wf_id, v in interaction_workflow_dict.iteritems():
transition_id_set, trigger_dict = v transition_id_set, trigger_dict = v
for tr_id, tdef in trigger_dict.iteritems(): for tr_id, tdef in trigger_dict.iteritems():
# Check portal type filter # Check portal type filter
if (tdef.portal_type_filter is not None and \ if (tdef.portal_type_filter is not None and \
portal_type not in tdef.portal_type_filter): portal_type not in tdef.portal_type_filter):
...@@ -604,7 +605,7 @@ def initializePortalTypeDynamicWorkflowMethods(ptype_klass, portal_workflow): ...@@ -604,7 +605,7 @@ def initializePortalTypeDynamicWorkflowMethods(ptype_klass, portal_workflow):
portal_type_group in tdef.portal_type_group_filter): portal_type_group in tdef.portal_type_group_filter):
continue continue
for imethod_id in tdef.method_id: for imethod_id in tdef.getTriggerMethodIdList():
if wildcard_interaction_method_id_match(imethod_id): if wildcard_interaction_method_id_match(imethod_id):
# Interactions workflows can use regexp based wildcard methods # Interactions workflows can use regexp based wildcard methods
# XXX What happens if exception ? # XXX What happens if exception ?
......
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