Commit 122be9d0 authored by wenjie.zheng's avatar wenjie.zheng

ERP5Site.py: check the action provider list after the workfkow tool migration,...

ERP5Site.py: check the action provider list after the workfkow tool migration, add portal_workflow if it was not in the list; clean up.
parent 6bfc62ce
...@@ -764,7 +764,7 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin): ...@@ -764,7 +764,7 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin):
state_dict = {} state_dict = {}
for wf in self.portal_workflow.objectValues(): for wf in self.portal_workflow.objectValues():
state_list = wf.getStateValueList() state_list = wf.getStateValueList()
for state_id in state_list.keys(): for state_id in state_list:
state = state_list[state_id] state = state_list[state_id]
if group in getattr(state, 'type_list', ()): if group in getattr(state, 'type_list', ()):
state_dict[state.getReference()] = None state_dict[state.getReference()] = None
...@@ -1289,7 +1289,7 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin): ...@@ -1289,7 +1289,7 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin):
for wf in self.portal_workflow.objectValues(): for wf in self.portal_workflow.objectValues():
if wf.getVariableValueList() and wf.getStateVariable() == 'simulation_state': if wf.getVariableValueList() and wf.getStateVariable() == 'simulation_state':
state_list = wf.getStateValueList() state_list = wf.getStateValueList()
for state_id in state_list.keys(): for state_id in state_list:
state = state_list[state_id] state = state_list[state_id]
if getattr(state, 'type_list', None): if getattr(state, 'type_list', None):
state_dict[state.getReference()] = None state_dict[state.getReference()] = None
...@@ -1668,6 +1668,10 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin): ...@@ -1668,6 +1668,10 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin):
self.portal_workflow = new_tool self.portal_workflow = new_tool
self.portal_workflow.id = 'portal_workflow' self.portal_workflow.id = 'portal_workflow'
self._delObject('portal_workflow_new') self._delObject('portal_workflow_new')
# check action provider list
if 'portal_workflow' not in self.portal_actions.listActionProviders():
self.portal_actions.addActionProvider('portal_workflow')
Globals.InitializeClass(ERP5Site) Globals.InitializeClass(ERP5Site)
def getBootstrapDirectory(): def getBootstrapDirectory():
......
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