Commit 2824d676 authored by iv's avatar iv

ERP5Workflow: continue removal of actbox_xxx in interactions

parent 31f2ef9e
...@@ -404,9 +404,9 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow): ...@@ -404,9 +404,9 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
# 1. Interaction as XML # 1. Interaction as XML
interaction_reference_list = [] interaction_reference_list = []
interaction_list = self.objectValues(portal_type='Interaction') interaction_list = self.objectValues(portal_type='Interaction')
interaction_prop_id_to_show = sorted(['actbox_category', 'actbox_url', 'actbox_name', interaction_prop_id_to_show = sorted(['activate_script_name',
'activate_script_name', 'after_script_name', 'before_commit_script_name', 'after_script_name', 'before_commit_script_name', 'description',
'description', 'groups', 'roles', 'expr', 'permissions', 'trigger_method_id', 'groups', 'roles', 'expr', 'permissions', 'trigger_method_id',
'trigger_once_per_transaction', 'portal_type_filter', 'portal_type_group_filter', 'trigger_once_per_transaction', 'portal_type_filter', 'portal_type_group_filter',
'script_name', 'temporary_document_disallowed', 'trigger_type']) 'script_name', 'temporary_document_disallowed', 'trigger_type'])
for tdef in interaction_list: for tdef in interaction_list:
...@@ -432,7 +432,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow): ...@@ -432,7 +432,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
property_value = tdef.getGuardExpression() property_value = tdef.getGuardExpression()
sub_object = SubElement(guard, property_id, attrib=dict(type='guard configuration')) sub_object = SubElement(guard, property_id, attrib=dict(type='guard configuration'))
# no-property definded action box configuration # no-property definded action box configuration
elif property_id in ['actbox_name', 'actbox_url', 'actbox_category', 'trigger_type']: elif property_id == 'trigger_type':
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'))
elif property_id in ['activate_script_name', 'after_script_name', elif property_id in ['activate_script_name', 'after_script_name',
......
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