From b6ababa16b2648b28832ef2ac5b61debf220cc63 Mon Sep 17 00:00:00 2001
From: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date: Thu, 25 Mar 2021 18:27:24 +0900
Subject: [PATCH] SQUASH configurator
---
...xtension.erp5.migrateWorkflowModuleToPortalWorkflow.py | 8 ++------
.../ebusiness_lotse_configuration_workflow.xml | 2 +-
.../portal_workflow/maxma_demo_configuration_workflow.xml | 2 +-
.../portal_workflow/run_my_doc_configuration_workflow.xml | 2 +-
.../portal_workflow/erp5_consulting_workflow.xml | 2 +-
.../portal_workflow/erp5_standard_workflow.xml | 2 +-
.../portal_workflow/officejs_sdk_workflow.xml | 2 +-
7 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/bt5/erp5_configurator/ExtensionTemplateItem/portal_components/extension.erp5.migrateWorkflowModuleToPortalWorkflow.py b/bt5/erp5_configurator/ExtensionTemplateItem/portal_components/extension.erp5.migrateWorkflowModuleToPortalWorkflow.py
index edec03fb21..fdb96b3a54 100644
--- a/bt5/erp5_configurator/ExtensionTemplateItem/portal_components/extension.erp5.migrateWorkflowModuleToPortalWorkflow.py
+++ b/bt5/erp5_configurator/ExtensionTemplateItem/portal_components/extension.erp5.migrateWorkflowModuleToPortalWorkflow.py
@@ -13,15 +13,14 @@ def migrateToERP5Workflow(portal_workflow, configurator_workflow):
for o in category_value_list ]
workflow = portal_workflow.newContent(
- id=workflow_id,
portal_type='Workflow',
reference=configurator_workflow.getId(),
comment=configurator_workflow.getComment(),
description=configurator_workflow.getDescription(),
+ state_variable=configurator_workflow.getProperty('state_variable_name'),
source_list=getCategoryList('state_', configurator_workflow.getSourceValueList()),
# ConfiguratorWorkflow PropertySheet
- configuration_after_script_id=configurator_workflow.getConfigurationAfterScriptId(),
- state_base_category=configurator_workflow.getStateBaseCategory())
+ configuration_after_script_id=configurator_workflow.getConfigurationAfterScriptId())
for business_configuration in configurator_workflow.getRelatedValueList(
portal_type='Business Configuration'):
business_configuration.setResourceValue(workflow)
@@ -32,7 +31,6 @@ def migrateToERP5Workflow(portal_workflow, configurator_workflow):
if subobject.getPortalType() == 'State':
state = workflow.newContent(
- id='state_' + reference,
portal_type='State',
reference=reference,
title=title,
@@ -45,7 +43,6 @@ def migrateToERP5Workflow(portal_workflow, configurator_workflow):
elif subobject.getPortalType() == 'Transition':
workflow.newContent(
- id='transition_' + reference,
portal_type='Transition',
reference=reference,
title=title,
@@ -70,7 +67,6 @@ def migrateToERP5Workflow(portal_workflow, configurator_workflow):
continue
workflow.newContent(
- id='variable_' + reference,
portal_type='Workflow Variable',
reference=reference,
title=title,
diff --git a/bt5/erp5_configurator_ebusiness_lotse/WorkflowTemplateItem/portal_workflow/ebusiness_lotse_configuration_workflow.xml b/bt5/erp5_configurator_ebusiness_lotse/WorkflowTemplateItem/portal_workflow/ebusiness_lotse_configuration_workflow.xml
index d29883e943..7905f2d716 100644
--- a/bt5/erp5_configurator_ebusiness_lotse/WorkflowTemplateItem/portal_workflow/ebusiness_lotse_configuration_workflow.xml
+++ b/bt5/erp5_configurator_ebusiness_lotse/WorkflowTemplateItem/portal_workflow/ebusiness_lotse_configuration_workflow.xml
@@ -60,7 +60,7 @@
</item>
<item>
<key> <string>state_variable</string> </key>
- <value> <string>simulation_state</string> </value>
+ <value> <string>current_state</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_configurator_maxma_demo/WorkflowTemplateItem/portal_workflow/maxma_demo_configuration_workflow.xml b/bt5/erp5_configurator_maxma_demo/WorkflowTemplateItem/portal_workflow/maxma_demo_configuration_workflow.xml
index d7721d53d0..620d422785 100644
--- a/bt5/erp5_configurator_maxma_demo/WorkflowTemplateItem/portal_workflow/maxma_demo_configuration_workflow.xml
+++ b/bt5/erp5_configurator_maxma_demo/WorkflowTemplateItem/portal_workflow/maxma_demo_configuration_workflow.xml
@@ -60,7 +60,7 @@
</item>
<item>
<key> <string>state_variable</string> </key>
- <value> <string>simulation_state</string> </value>
+ <value> <string>current_state</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_configurator_run_my_doc/WorkflowTemplateItem/portal_workflow/run_my_doc_configuration_workflow.xml b/bt5/erp5_configurator_run_my_doc/WorkflowTemplateItem/portal_workflow/run_my_doc_configuration_workflow.xml
index bb86abaffa..c12e242772 100644
--- a/bt5/erp5_configurator_run_my_doc/WorkflowTemplateItem/portal_workflow/run_my_doc_configuration_workflow.xml
+++ b/bt5/erp5_configurator_run_my_doc/WorkflowTemplateItem/portal_workflow/run_my_doc_configuration_workflow.xml
@@ -58,7 +58,7 @@
</item>
<item>
<key> <string>state_variable</string> </key>
- <value> <string>simulation_state</string> </value>
+ <value> <string>current_state</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_configurator_standard/WorkflowTemplateItem/portal_workflow/erp5_consulting_workflow.xml b/bt5/erp5_configurator_standard/WorkflowTemplateItem/portal_workflow/erp5_consulting_workflow.xml
index 2cff0117d7..97dcbc65fd 100644
--- a/bt5/erp5_configurator_standard/WorkflowTemplateItem/portal_workflow/erp5_consulting_workflow.xml
+++ b/bt5/erp5_configurator_standard/WorkflowTemplateItem/portal_workflow/erp5_consulting_workflow.xml
@@ -58,7 +58,7 @@
</item>
<item>
<key> <string>state_variable</string> </key>
- <value> <string>simulation_state</string> </value>
+ <value> <string>current_state</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_configurator_standard/WorkflowTemplateItem/portal_workflow/erp5_standard_workflow.xml b/bt5/erp5_configurator_standard/WorkflowTemplateItem/portal_workflow/erp5_standard_workflow.xml
index e9d9f18b15..baf31f326c 100644
--- a/bt5/erp5_configurator_standard/WorkflowTemplateItem/portal_workflow/erp5_standard_workflow.xml
+++ b/bt5/erp5_configurator_standard/WorkflowTemplateItem/portal_workflow/erp5_standard_workflow.xml
@@ -60,7 +60,7 @@
</item>
<item>
<key> <string>state_variable</string> </key>
- <value> <string>simulation_state</string> </value>
+ <value> <string>current_state</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_configurator_standard/WorkflowTemplateItem/portal_workflow/officejs_sdk_workflow.xml b/bt5/erp5_configurator_standard/WorkflowTemplateItem/portal_workflow/officejs_sdk_workflow.xml
index 605551bd1e..c6435239ec 100644
--- a/bt5/erp5_configurator_standard/WorkflowTemplateItem/portal_workflow/officejs_sdk_workflow.xml
+++ b/bt5/erp5_configurator_standard/WorkflowTemplateItem/portal_workflow/officejs_sdk_workflow.xml
@@ -60,7 +60,7 @@
</item>
<item>
<key> <string>state_variable</string> </key>
- <value> <string>simulation_state</string> </value>
+ <value> <string>current_state</string> </value>
</item>
</dictionary>
</pickle>
--
GitLab