From fa2a362e9e49588ba3e5a6cdbcb791c2efe7d703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Fri, 2 Mar 2012 14:47:56 +0100 Subject: [PATCH] Drop one entry workflow. slap_interaction_workflow has already global scope of interaction, so keep it like this and do not add yet another workflow to do one interaction. --- .../workflow_chain_type.xml | 4 -- .../vifib_interaction_workflow.xml | 46 ------------------- .../interactions.xml | 28 ----------- .../vifib_interaction_workflow/scripts.xml | 28 ----------- .../vifib_interaction_workflow/variables.xml | 22 --------- .../vifib_interaction_workflow/worklists.xml | 22 --------- master/bt5/vifib_base/bt/revision | 2 +- .../template_portal_type_workflow_chain_list | 1 - .../vifib_base/bt/template_workflow_id_list | 3 +- .../Computer_setAllocationScope.xml | 0 ..._reindexRelatedPurchasePackingListLine.xml | 0 master/bt5/vifib_slap/bt/revision | 2 +- 12 files changed, 3 insertions(+), 155 deletions(-) delete mode 100644 master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow.xml delete mode 100644 master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/interactions.xml delete mode 100644 master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/scripts.xml delete mode 100644 master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/variables.xml delete mode 100644 master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/worklists.xml rename master/bt5/{vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow => vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow}/interactions/Computer_setAllocationScope.xml (100%) rename master/bt5/{vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow => vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow}/scripts/Computer_reindexRelatedPurchasePackingListLine.xml (100%) diff --git a/master/bt5/vifib_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/master/bt5/vifib_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 3be9d4a9e..be2bd8d61 100644 --- a/master/bt5/vifib_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/master/bt5/vifib_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -1,8 +1,4 @@ <workflow_chain> - <chain> - <type>Computer</type> - <workflow>vifib_interaction_workflow</workflow> - </chain> <chain> <type>Slave Instance</type> <workflow>edit_workflow, item_workflow, software_instance_slap_interface_workflow</workflow> diff --git a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow.xml b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow.xml deleted file mode 100644 index 3c4fd12b0..000000000 --- a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_objects</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>creation_guard</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>groups</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>vifib_interaction_workflow</string> </value> - </item> - <item> - <key> <string>manager_bypass</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/interactions.xml b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/interactions.xml deleted file mode 100644 index e18bf8cbf..000000000 --- a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/interactions.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="Interaction" module="Products.ERP5.Interaction"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_mapping</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>_objects</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>interactions</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/scripts.xml b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/scripts.xml deleted file mode 100644 index 072c8f654..000000000 --- a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/scripts.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="Scripts" module="Products.DCWorkflow.Scripts"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_mapping</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>_objects</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>scripts</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/variables.xml b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/variables.xml deleted file mode 100644 index 6ae03699d..000000000 --- a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/variables.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="Variables" module="Products.DCWorkflow.Variables"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_mapping</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>variables</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/worklists.xml b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/worklists.xml deleted file mode 100644 index c3432aa05..000000000 --- a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/worklists.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="Worklists" module="Products.DCWorkflow.Worklists"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_mapping</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>worklists</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/master/bt5/vifib_base/bt/revision b/master/bt5/vifib_base/bt/revision index 5587802b4..7b89b2202 100644 --- a/master/bt5/vifib_base/bt/revision +++ b/master/bt5/vifib_base/bt/revision @@ -1 +1 @@ -405 \ No newline at end of file +406 \ No newline at end of file diff --git a/master/bt5/vifib_base/bt/template_portal_type_workflow_chain_list b/master/bt5/vifib_base/bt/template_portal_type_workflow_chain_list index 2a3628104..9e23c65e6 100644 --- a/master/bt5/vifib_base/bt/template_portal_type_workflow_chain_list +++ b/master/bt5/vifib_base/bt/template_portal_type_workflow_chain_list @@ -1,4 +1,3 @@ -Computer | vifib_interaction_workflow Slave Instance | edit_workflow Slave Instance | item_workflow Slave Instance | software_instance_slap_interface_workflow diff --git a/master/bt5/vifib_base/bt/template_workflow_id_list b/master/bt5/vifib_base/bt/template_workflow_id_list index 99cb69c4d..69337152e 100644 --- a/master/bt5/vifib_base/bt/template_workflow_id_list +++ b/master/bt5/vifib_base/bt/template_workflow_id_list @@ -1,2 +1 @@ -software_instance_slap_interface_workflow -vifib_interaction_workflow \ No newline at end of file +software_instance_slap_interface_workflow \ No newline at end of file diff --git a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/interactions/Computer_setAllocationScope.xml b/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/Computer_setAllocationScope.xml similarity index 100% rename from master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/interactions/Computer_setAllocationScope.xml rename to master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/Computer_setAllocationScope.xml diff --git a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/scripts/Computer_reindexRelatedPurchasePackingListLine.xml b/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/Computer_reindexRelatedPurchasePackingListLine.xml similarity index 100% rename from master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/vifib_interaction_workflow/scripts/Computer_reindexRelatedPurchasePackingListLine.xml rename to master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/Computer_reindexRelatedPurchasePackingListLine.xml diff --git a/master/bt5/vifib_slap/bt/revision b/master/bt5/vifib_slap/bt/revision index 7dfce3516..6001de1bb 100644 --- a/master/bt5/vifib_slap/bt/revision +++ b/master/bt5/vifib_slap/bt/revision @@ -1 +1 @@ -594 \ No newline at end of file +595 \ No newline at end of file -- 2.30.9