Commit f137c6d5 authored by Aurel's avatar Aurel

fix export of empty workflow chain

don't give empty or (Default) workflow chain when guessing properties


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5457 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b486287c
...@@ -1118,7 +1118,7 @@ class PortalTypeWorkflowChainTemplateItem(BaseTemplateItem): ...@@ -1118,7 +1118,7 @@ class PortalTypeWorkflowChainTemplateItem(BaseTemplateItem):
portal_type = wflist[0] portal_type = wflist[0]
workflow = wflist[1] workflow = wflist[1]
else: else:
portal_type = wflist[0] portal_type = wflist[0][:-2]
workflow = '' workflow = ''
if chain_dict.has_key('chain_%s' % portal_type): if chain_dict.has_key('chain_%s' % portal_type):
if workflow not in chain_dict['chain_%s' % portal_type]: if workflow not in chain_dict['chain_%s' % portal_type]:
...@@ -1131,7 +1131,7 @@ class PortalTypeWorkflowChainTemplateItem(BaseTemplateItem): ...@@ -1131,7 +1131,7 @@ class PortalTypeWorkflowChainTemplateItem(BaseTemplateItem):
else: else:
self._objects[portal_type] = [workflow,] self._objects[portal_type] = [workflow,]
else: else:
LOG('BusinessTemplate build', 0, 'portal type %s not found in workflow chain' %(portal_type)) LOG('BusinessTemplate build', 100, 'portal type %s not found in workflow chain' %(portal_type))
def generateXml(self, path=None): def generateXml(self, path=None):
xml_data = '<workflow_chain>' xml_data = '<workflow_chain>'
...@@ -4305,7 +4305,9 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -4305,7 +4305,9 @@ Business Template is a set of definitions, such as skins, portal types and categ
if hasattr(portal_type, 'listActions'): if hasattr(portal_type, 'listActions'):
action_list = [x.getId() for x in portal_type.listActions()] action_list = [x.getId() for x in portal_type.listActions()]
if chain_dict.has_key('chain_%s' % id): if chain_dict.has_key('chain_%s' % id):
wf_list = chain_dict['chain_%s' % id].split(', ') chain = chain_dict['chain_%s' % id]
if chain != '' and chain != '(Default)':
wf_list = chain.split(', ')
for a_id in allowed_content_type_list: for a_id in allowed_content_type_list:
allowed_id = id+' | '+a_id allowed_id = id+' | '+a_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