Commit af391e63 authored by wenjie.zheng's avatar wenjie.zheng

Base.py: isWorkflow5MethodSUpported improvement.

parent 93701b7f
...@@ -72,7 +72,7 @@ from Products.ERP5Type.Accessor import Base as BaseAccessor ...@@ -72,7 +72,7 @@ from Products.ERP5Type.Accessor import Base as BaseAccessor
from Products.ERP5Type.mixin.property_translatable import PropertyTranslatableBuiltInDictMixIn from Products.ERP5Type.mixin.property_translatable import PropertyTranslatableBuiltInDictMixIn
from Products.ERP5Type.XMLExportImport import Base_asXML from Products.ERP5Type.XMLExportImport import Base_asXML
from Products.ERP5Type.Cache import CachingMethod, clearCache, getReadOnlyTransactionCache from Products.ERP5Type.Cache import CachingMethod, clearCache, getReadOnlyTransactionCache
from Accessor import WorkflowState from Accessor import WorkflowState, Value
from Products.ERP5Type.Log import log as unrestrictedLog from Products.ERP5Type.Log import log as unrestrictedLog
from Products.ERP5Type.TransactionalVariable import getTransactionalVariable from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
from Products.ERP5Type.Accessor.TypeDefinition import type_definition from Products.ERP5Type.Accessor.TypeDefinition import type_definition
...@@ -207,7 +207,7 @@ class WorkflowMethod(Method): ...@@ -207,7 +207,7 @@ class WorkflowMethod(Method):
for wf_id, transition_list in candidate_transition_item_list: for wf_id, transition_list in candidate_transition_item_list:
valid_list = [] valid_list = []
for transition_id in transition_list: for transition_id in transition_list:
if wf5_module._getOb(wf_id).isWorkflow5MethodSupported(instance, wf5_module._getOb(wf_id)._getOb(transition_id)): if wf5_module._getOb(wf_id).isWorkflow5MethodSupported(instance, wf5_module._getOb(wf_id)._getOb(transition_id), wf_id):
#if wf5_module._getOb(wf_id)._getOb(transition_id) in instance.getCategoryStateValue().getDestinationValueList(): #if wf5_module._getOb(wf_id)._getOb(transition_id) in instance.getCategoryStateValue().getDestinationValueList():
valid_list.append(transition_id) valid_list.append(transition_id)
once_transition_key = once_transition_dict.get((wf_id, transition_id)) once_transition_key = once_transition_dict.get((wf_id, transition_id))
...@@ -535,6 +535,7 @@ def intializePortalTypeERP5WorkflowMethod(ptype_klass, portal_workflow5): ...@@ -535,6 +535,7 @@ def intializePortalTypeERP5WorkflowMethod(ptype_klass, portal_workflow5):
pt = portal_type._getOb(ptype_klass.__name__) pt = portal_type._getOb(ptype_klass.__name__)
#raise NotImplementedError (portal_type) #raise NotImplementedError (portal_type)
#raise NotImplementedError (wf5_module)#<Workflow Module at workflow_module> #raise NotImplementedError (wf5_module)#<Workflow Module at workflow_module>
### creat workflow method:
for workflow5 in pt.workflow_list: for workflow5 in pt.workflow_list:
for tr in wf5_module._getOb(workflow5).objectValues(portal_type="Transition"): for tr in wf5_module._getOb(workflow5).objectValues(portal_type="Transition"):
tr_id = tr.id tr_id = tr.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