diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions.xml index 7d8c51003b7e09d577b9ce4a374f51510b4e2ead..879a78b540f5742c1dc5bb51265c562252bdf194 100644 --- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions.xml +++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.ERP5.Interaction</string> - <string>Interaction</string> - </tuple> - <none/> + <global name="Interaction" module="Products.ERP5.Interaction"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/Document_edit.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/Document_edit.xml index 64d7f5f9cbbbc6d70e8b23218c74073abe6f4515..e8ca7fd0ffc7b97b356b0b7fd911b0882cbe2542 100644 --- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/Document_edit.xml +++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/Document_edit.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.ERP5.Interaction</string> - <string>InteractionDefinition</string> - </tuple> - <none/> + <global name="InteractionDefinition" module="Products.ERP5.Interaction"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/Document_setFile.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/Document_setFile.xml index 846ec42b623e1907040ca2e31291d71087ec95b1..79f8904aac827246c73b58335bbafa24894252fb 100644 --- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/Document_setFile.xml +++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/Document_setFile.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.ERP5.Interaction</string> - <string>InteractionDefinition</string> - </tuple> - <none/> + <global name="InteractionDefinition" module="Products.ERP5.Interaction"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/OOoDocument_edit.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/OOoDocument_edit.xml index eb1c2c80a4e1538a87fc30b6041e790494ea0b50..caccc198d9dbbc2edb052c12f2f1d1ff6a671168 100644 --- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/OOoDocument_edit.xml +++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/interactions/OOoDocument_edit.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.ERP5.Interaction</string> - <string>InteractionDefinition</string> - </tuple> - <none/> + <global name="InteractionDefinition" module="Products.ERP5.Interaction"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts.xml index 01ba35bf25f5084dde4a3822b204530dc92c3f47..66683dde0451b4de3eeb20f0fe5c7af60083c8a8 100644 --- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts.xml +++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Scripts</string> - <string>Scripts</string> - </tuple> - <none/> + <global name="Scripts" module="Products.DCWorkflow.Scripts"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/OOoDocument_updateMetadata.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/OOoDocument_updateMetadata.xml index eab640ef14862d2307a20ea873e6f312d4a80697..48f9f567e8df07780668f42a050fbede44aa1078 100644 --- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/OOoDocument_updateMetadata.xml +++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/OOoDocument_updateMetadata.xml @@ -102,7 +102,7 @@ if document.hasBaseData():\n new_metadata[metadata_key] = value\n if new_metadata:\n # edit metadata via server\n - document.activate().updateBaseMetadata(**new_metadata)\n + document.activate().Document_tryToUpdateBaseMetadata(**new_metadata)\n ]]></string> </value> diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/clearCacheUponUpload.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/clearCacheUponUpload.xml index 0bac5c08e4bf607bdaeb41e5f75381e1c3bda664..fb3c6020a5800edd54b44ac371f15f2719d6153f 100644 --- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/clearCacheUponUpload.xml +++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/clearCacheUponUpload.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.PythonScripts.PythonScript</string> - <string>PythonScript</string> - </tuple> - <none/> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/updateLocalRoles.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/updateLocalRoles.xml index d1612c471fc8d1f8ec812cb025de1623c486a009..52e724cee6643d1e8eaa271cbdbbe1da19a08bbc 100644 --- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/updateLocalRoles.xml +++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/updateLocalRoles.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.PythonScripts.PythonScript</string> - <string>PythonScript</string> - </tuple> - <none/> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml index d1d85482effe32eb0c593aef71604d66c23aa8a7..31ad79889051c9e6234719949faa7f7eade5e632 100644 --- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml +++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.PythonScripts.PythonScript</string> - <string>PythonScript</string> - </tuple> - <none/> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + <tuple/> </tuple> </pickle> <pickle> @@ -75,7 +72,8 @@ object.uploadFile()\n # because it will be gone from there in a second\n # and activate would fail\n if object.getParentValue().getPortalType() != \'Contribution Tool\':\n - object.activate().convertToBaseFormat()\n + object.processFile()\n + object.activate().Document_tryToConvertToBaseFormat()\n </string> </value> </item> <item> diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/variables.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/variables.xml index db67387d4e62a7db68bbb9689238ba0824326e50..733d9ce458eebdbf2f511e03ef3d0831d9587ce9 100644 --- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/variables.xml +++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/variables.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Variables</string> - <string>Variables</string> - </tuple> - <none/> + <global name="Variables" module="Products.DCWorkflow.Variables"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/worklists.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/worklists.xml index f4c2789633e196d41819670f25c55bac972e751a..3953ad0209bd0cd9a4f7c91ba6db81eebb08acfc 100644 --- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/worklists.xml +++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/worklists.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Worklists</string> - <string>Worklists</string> - </tuple> - <none/> + <global name="Worklists" module="Products.DCWorkflow.Worklists"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 83249da5a136e0e0e9388917c65b042ef5179b5e..bc93f9457e9e028f9b047a765d809ab78dc3dd88 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -784 \ No newline at end of file +786 \ No newline at end of file