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

Workflow.py: showAsXML has the same structure as DCWorkflow_showAsXML.

parent 32208a44
...@@ -741,14 +741,29 @@ class Workflow(IdAsReferenceMixin("workflow_", "prefix"), XMLObject): ...@@ -741,14 +741,29 @@ class Workflow(IdAsReferenceMixin("workflow_", "prefix"), XMLObject):
root = Element('erp5') root = Element('erp5')
return_as_object = False return_as_object = False
# Define a list of property to show to users:
workflow_prop_id_to_show = ['title', 'description', 'state_var',
'permissions', 'initial_state']
# workflow as XML, need to rename DC workflow's portal_type before comparison. # workflow as XML, need to rename DC workflow's portal_type before comparison.
workflow = SubElement(root, 'workflow', workflow = SubElement(root, 'workflow',
attrib=dict(id=self.getId(), attrib=dict(id=self.getReference(),
portal_type=self.getPortalType())) portal_type=self.getPortalType()))
"""
for prop_id in sorted(self.propertyIds()): for prop_id in sorted(workflow_prop_id_to_show):
# In most case, we should not synchronize acquired properties # In most case, we should not synchronize acquired properties
if prop_id not in ('uid', 'workflow_history', 'id', 'portal_type',): if prop_id not in ('uid', 'workflow_history', 'id', 'portal_type',):
if prop_id == 'permissions':
value = self.getProperty('workflow_managed_permission_list')
prop_type = self.getPropertyType('workflow_managed_permission_list')
sub_object = SubElement(workflow, prop_id, attrib=dict(type=prop_type))
elif prop_id == 'initial_state':
value = self.getSourceValue().getReference()
sub_object = SubElement(workflow, prop_id, attrib=dict(type='string'))
elif prop_id =='state_var':
value = self.getProperty('state_variable')
sub_object = SubElement(workflow, prop_id, attrib=dict(type='string'))
else:
value = self.getProperty(prop_id) value = self.getProperty(prop_id)
if value is None: if value is None:
# not registered if not defined. # not registered if not defined.
...@@ -774,6 +789,10 @@ class Workflow(IdAsReferenceMixin("workflow_", "prefix"), XMLObject): ...@@ -774,6 +789,10 @@ class Workflow(IdAsReferenceMixin("workflow_", "prefix"), XMLObject):
else: else:
raise ValueError("XMLExportImport failed, the data is undefined") raise ValueError("XMLExportImport failed, the data is undefined")
elif prop_type in ('lines', 'tokens',): elif prop_type in ('lines', 'tokens',):
if prop_id == 'initial_state':
if self.getSourceValue():
sub_object.text = self.getSourceValue().getReference()
else:
value = [word.decode('utf-8').encode('ascii','xmlcharrefreplace')\ value = [word.decode('utf-8').encode('ascii','xmlcharrefreplace')\
for word in value] for word in value]
sub_object.append(marshaller(value)) sub_object.append(marshaller(value))
...@@ -784,6 +803,7 @@ class Workflow(IdAsReferenceMixin("workflow_", "prefix"), XMLObject): ...@@ -784,6 +803,7 @@ class Workflow(IdAsReferenceMixin("workflow_", "prefix"), XMLObject):
sub_object.text = unicode(escape(value), 'utf-8') sub_object.text = unicode(escape(value), 'utf-8')
elif prop_type != 'None': elif prop_type != 'None':
sub_object.text = str(value) sub_object.text = str(value)
"""
# We should now describe security settings # We should now describe security settings
for user_role in self.get_local_roles(): for user_role in self.get_local_roles():
local_role_node = SubElement(workflow, 'local_role', local_role_node = SubElement(workflow, 'local_role',
...@@ -806,19 +826,20 @@ class Workflow(IdAsReferenceMixin("workflow_", "prefix"), XMLObject): ...@@ -806,19 +826,20 @@ class Workflow(IdAsReferenceMixin("workflow_", "prefix"), XMLObject):
local_group_node = SubElement(workflow, 'local_group', local_group_node = SubElement(workflow, 'local_group',
attrib=dict(id=group_role[0], type='tokens')) attrib=dict(id=group_role[0], type='tokens'))
local_group_node.append(marshaller(group_role[1])) local_group_node.append(marshaller(group_role[1]))
"""
# 1. State as XML # 1. State as XML
state_reference_list = [] state_reference_list = []
state_list = self.objectValues(portal_type='State') state_list = self.objectValues(portal_type='State')
# show reference instead of id
state_prop_id_to_show = ['reference', 'title', 'description',
'categories_list', 'is_selected', 'state_permission_roles']
for sdef in state_list: for sdef in state_list:
state_reference_list.append(sdef.getReference()) state_reference_list.append(sdef.getReference())
states = SubElement(workflow, 'states', attrib=dict(state_list=str(state_reference_list), states = SubElement(workflow, 'states', attrib=dict(state_list=str(state_reference_list),
number_of_element=str(len(state_reference_list)))) number_of_element=str(len(state_reference_list))))
for sdef in state_list: for sdef in state_list:
state = SubElement(states, 'state', attrib=dict(reference=sdef.getReference())) state = SubElement(states, 'state', attrib=dict(reference=sdef.getReference()))
for property_id in sorted(sdef.propertyIds()): for property_id in sorted(state_prop_id_to_show):
property_value = sdef.getProperty(property_id) property_value = sdef.getProperty(property_id)
if property_value is None: if property_value is None:
# do not register if not defined. # do not register if not defined.
...@@ -894,7 +915,9 @@ class Workflow(IdAsReferenceMixin("workflow_", "prefix"), XMLObject): ...@@ -894,7 +915,9 @@ class Workflow(IdAsReferenceMixin("workflow_", "prefix"), XMLObject):
number_of_element=str(len(script_reference_list)))) number_of_element=str(len(script_reference_list))))
for sdef in script_list: for sdef in script_list:
script = SubElement(scripts, 'script', attrib=dict(reference=sdef.getReference())) script = SubElement(scripts, 'script', attrib=dict(reference=sdef.getReference()))
"""
# return xml object
if return_as_object: if return_as_object:
return root return root
return etree.tostring(root, encoding='utf-8', return etree.tostring(root, encoding='utf-8',
......
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