diff --git a/product/ERP5/Interaction.py b/product/ERP5/Interaction.py index 88f8da547620ab7c996c41c4287c52b5ad643285..2af4042ccb7ab3b4968038a80e2b860e0cdf08fc 100644 --- a/product/ERP5/Interaction.py +++ b/product/ERP5/Interaction.py @@ -311,11 +311,6 @@ class InteractionDefinition (SimpleItem): return [] return self.portal_type_group_filter - def getTransitionVariableValueList(self): - if self.var_exprs is None: - return [] - return self.var_exprs - showDict = Base.showDict convertToERP5Workflow = convertToERP5Workflow diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 8774fe0b313d51132d2f04a586cb2d10a24136e9..45313eb17b6ac9b91380ebbd56eb633dd034900d 100644 --- a/product/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/product/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -73,9 +73,6 @@ <item>SQL Non Continuous Increasing Id Generator</item> <item>ZODB Continuous Increasing Id Generator</item> </portal_type> - <portal_type id="Interaction"> - <item>Transition Variable</item> - </portal_type> <portal_type id="Interaction Workflow"> <item>Interaction</item> <item>Workflow Script</item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Interaction_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Interaction_view.xml index 86ef5b28d504d663044d89e457a3f295d2586137..64d277215ad7d8791633a90f9ea17a6122f11358 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Interaction_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Interaction_view.xml @@ -53,9 +53,7 @@ <item> <key> <string>bottom</string> </key> <value> - <list> - <string>listbox</string> - </list> + <list/> </value> </item> <item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Interaction_view/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Interaction_view/listbox.xml deleted file mode 100644 index 5b62fa35999d7370961a72a05515ea60ebc91165..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Interaction_view/listbox.xml +++ /dev/null @@ -1,133 +0,0 @@ -<?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> diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list index 05d98ea75514e723bfe738a7d24dc47ff402c0a8..65fe10d801213afaf9f1049faefac6e8a164d764 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list +++ b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list @@ -37,7 +37,6 @@ Id Tool | ZODB Continuous Increasing Id Generator Interaction Workflow | Interaction Interaction Workflow | Workflow Script Interaction Workflow | Workflow Variable -Interaction | Transition Variable Memcached Tool | Memcached Plugin Preference Tool Type | Action Information Preference Tool Type | Role Information diff --git a/product/ERP5Type/Core/Interaction.py b/product/ERP5Type/Core/Interaction.py index 2ec5e18da92703366954ed02e8a4320419903612..63f2f1e14f2ef27be8600d00b34f108948ca9b50 100644 --- a/product/ERP5Type/Core/Interaction.py +++ b/product/ERP5Type/Core/Interaction.py @@ -117,11 +117,3 @@ class Interaction(IdAsReferenceMixin('interaction_'), prefix_length = len('before_commit_script/') return [path[prefix_length:] for path in self.getCategoryList() if path.startswith('before_commit_script/')] - - security.declareProtected(Permissions.AccessContentsInformation, - 'getTransitionVariableValueList') - def getTransitionVariableValueList(self): - """ - Return Transition Variables - """ - return self.objectValues(portal_type='Transition Variable') diff --git a/product/ERP5Type/Core/InteractionWorkflow.py b/product/ERP5Type/Core/InteractionWorkflow.py index 2f1d7cc88442770b846f808f749f5b514283236e..2e9234646f5724b7d41b2b1a1dbbd41e3772e580 100644 --- a/product/ERP5Type/Core/InteractionWorkflow.py +++ b/product/ERP5Type/Core/InteractionWorkflow.py @@ -244,16 +244,13 @@ class InteractionWorkflow(Workflow): sci = None # Update variables. - tdef_exprs = {v.getId(): v for v in tdef.getTransitionVariableValueList()} status = {} for vdef in workflow_variable_list: id_ = vdef.getId() if not vdef.getStatusIncluded(): continue expression = None - if id_ in tdef_exprs: - expression = tdef_exprs[id_] - elif not vdef.getAutomaticUpdate() and id_ in former_status: + if not vdef.getAutomaticUpdate() and id_ in former_status: # Preserve former value value = former_status[id_] else: