Skip to content

erp5
erp5
Commit 3eeb3f58 authored by Arnaud Fontaine's avatar Arnaud Fontaine
Browse files
Options

ERP5Workflow: No need for Transition Variables on Interactions.

parent 774ef6ef
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 157 deletions
product/ERP5/Interaction.py
View file @ 3eeb3f58
...@@ -311,11 +311,6 @@ class InteractionDefinition (SimpleItem): ...@@ -311,11 +311,6 @@ class InteractionDefinition (SimpleItem):
return [] return []
return self.portal_type_group_filter return self.portal_type_group_filter
def getTransitionVariableValueList(self):
if self.var_exprs is None:
return []
return self.var_exprs
showDict = Base.showDict showDict = Base.showDict
convertToERP5Workflow = convertToERP5Workflow convertToERP5Workflow = convertToERP5Workflow
......
product/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @ 3eeb3f58
...@@ -73,9 +73,6 @@ ...@@ -73,9 +73,6 @@
<item>SQL Non Continuous Increasing Id Generator</item> <item>SQL Non Continuous Increasing Id Generator</item>
<item>ZODB Continuous Increasing Id Generator</item> <item>ZODB Continuous Increasing Id Generator</item>
</portal_type> </portal_type>
<portal_type id="Interaction">
<item>Transition Variable</item>
</portal_type>
<portal_type id="Interaction Workflow"> <portal_type id="Interaction Workflow">
<item>Interaction</item> <item>Interaction</item>
<item>Workflow Script</item> <item>Workflow Script</item>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Interaction_view.xml
View file @ 3eeb3f58
...@@ -53,9 +53,7 @@ ...@@ -53,9 +53,7 @@
<item> <item>
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list/>
<string>listbox</string>
</list>
</value> </value>
</item> </item>
<item> <item>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Interaction_view/listbox.xml deleted 100644 → 0
View file @ 774ef6ef
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>columns</string>
<string>portal_types</string>
<string>selection_name</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
<string>id</string>
<string>ID</string>
</tuple>
<tuple>
<string>causality_title</string>
<string>Causality</string>
</tuple>
<tuple>
<string>Variable_getNonEvaluatedVariableDefault</string>
<string>Default Value</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_view_mode_listbox</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
<list>
<tuple>
<string>Transition Variable</string>
<string>Transition Variable</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>interaction_variable_selection</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Interaction Variables</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list
View file @ 3eeb3f58
...@@ -37,7 +37,6 @@ Id Tool | ZODB Continuous Increasing Id Generator ...@@ -37,7 +37,6 @@ Id Tool | ZODB Continuous Increasing Id Generator
Interaction Workflow | Interaction Interaction Workflow | Interaction
Interaction Workflow | Workflow Script Interaction Workflow | Workflow Script
Interaction Workflow | Workflow Variable Interaction Workflow | Workflow Variable
Interaction | Transition Variable
Memcached Tool | Memcached Plugin Memcached Tool | Memcached Plugin
Preference Tool Type | Action Information Preference Tool Type | Action Information
Preference Tool Type | Role Information Preference Tool Type | Role Information
......
product/ERP5Type/Core/Interaction.py
View file @ 3eeb3f58
...@@ -117,11 +117,3 @@ class Interaction(IdAsReferenceMixin('interaction_'), ...@@ -117,11 +117,3 @@ class Interaction(IdAsReferenceMixin('interaction_'),
prefix_length = len('before_commit_script/') prefix_length = len('before_commit_script/')
return [path[prefix_length:] for path in self.getCategoryList() return [path[prefix_length:] for path in self.getCategoryList()
if path.startswith('before_commit_script/')] if path.startswith('before_commit_script/')]
security.declareProtected(Permissions.AccessContentsInformation,
'getTransitionVariableValueList')
def getTransitionVariableValueList(self):
"""
Return Transition Variables
"""
return self.objectValues(portal_type='Transition Variable')
product/ERP5Type/Core/InteractionWorkflow.py
View file @ 3eeb3f58
...@@ -244,16 +244,13 @@ class InteractionWorkflow(Workflow): ...@@ -244,16 +244,13 @@ class InteractionWorkflow(Workflow):
sci = None sci = None
# Update variables. # Update variables.
tdef_exprs = {v.getId(): v for v in tdef.getTransitionVariableValueList()}
status = {} status = {}
for vdef in workflow_variable_list: for vdef in workflow_variable_list:
id_ = vdef.getId() id_ = vdef.getId()
if not vdef.getStatusIncluded(): if not vdef.getStatusIncluded():
continue continue
expression = None expression = None
if id_ in tdef_exprs: if not vdef.getAutomaticUpdate() and id_ in former_status:
expression = tdef_exprs[id_]
elif not vdef.getAutomaticUpdate() and id_ in former_status:
# Preserve former value # Preserve former value
value = former_status[id_] value = former_status[id_]
else: else:
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7