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

ERP5/InteractionWorkflow.py: fix null property_value in showAsXML.

parent 27be8c51
...@@ -379,6 +379,8 @@ class InteractionWorkflowDefinition (DCWorkflowDefinition, ActiveObject): ...@@ -379,6 +379,8 @@ class InteractionWorkflowDefinition (DCWorkflowDefinition, ActiveObject):
for prop_id in sorted(interaction_workflow_prop_id_to_show): for prop_id in sorted(interaction_workflow_prop_id_to_show):
prop_value = self.__dict__[prop_id] prop_value = self.__dict__[prop_id]
if prop_value is None or prop_value == [] or prop_value == ():
prop_value = ''
prop_type = interaction_workflow_prop_id_to_show[prop_id] prop_type = interaction_workflow_prop_id_to_show[prop_id]
sub_object = SubElement(interaction_workflow, prop_id, attrib=dict(type=prop_type)) sub_object = SubElement(interaction_workflow, prop_id, attrib=dict(type=prop_type))
sub_object.text = str(prop_value) sub_object.text = str(prop_value)
...@@ -421,7 +423,10 @@ class InteractionWorkflowDefinition (DCWorkflowDefinition, ActiveObject): ...@@ -421,7 +423,10 @@ class InteractionWorkflowDefinition (DCWorkflowDefinition, ActiveObject):
property_value = getattr(tdef, property_id, None) property_value = getattr(tdef, property_id, None)
sub_object = SubElement(interaction, property_id, attrib=dict(type='string')) sub_object = SubElement(interaction, property_id, attrib=dict(type='string'))
else: else:
if property_id in tdef.__dict__:
property_value = tdef.__dict__[property_id] property_value = tdef.__dict__[property_id]
else:
property_value = ''
property_type = interaction_prop_id_to_show[property_id] property_type = interaction_prop_id_to_show[property_id]
sub_object = SubElement(interaction, property_id, attrib=dict(type=property_type)) sub_object = SubElement(interaction, property_id, attrib=dict(type=property_type))
if property_value is None or property_value == [] or property_value == (): if property_value is None or property_value == [] or property_value == ():
...@@ -429,8 +434,8 @@ class InteractionWorkflowDefinition (DCWorkflowDefinition, ActiveObject): ...@@ -429,8 +434,8 @@ class InteractionWorkflowDefinition (DCWorkflowDefinition, ActiveObject):
if property_id in ['once_per_transaction', 'temporary_document_disallowed']: if property_id in ['once_per_transaction', 'temporary_document_disallowed']:
if property_value == True: if property_value == True:
property_value = '1' property_value = '1'
elif property_value == False: elif property_value == False or property_value is '':
property_value ='0' property_value = '0'
sub_object.text = str(property_value) sub_object.text = str(property_value)
# 2. Variable as XML # 2. Variable as XML
...@@ -486,6 +491,8 @@ class InteractionWorkflowDefinition (DCWorkflowDefinition, ActiveObject): ...@@ -486,6 +491,8 @@ class InteractionWorkflowDefinition (DCWorkflowDefinition, ActiveObject):
property_value = getattr(sdef, property_id) property_value = getattr(sdef, property_id)
property_type = script_prop_id_to_show[property_id] property_type = script_prop_id_to_show[property_id]
sub_object = SubElement(script, property_id, attrib=dict(type=property_type)) sub_object = SubElement(script, property_id, attrib=dict(type=property_type))
if property_value is None or property_value == [] or property_value == ():
property_value = ''
sub_object.text = str(property_value) sub_object.text = str(property_value)
# return xml object # return xml object
......
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