From 334db485c28a808f4c1af78e667cb6b98c2c5db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=A8le=20Vanbaelinghem?= <daniele@nexedi.com> Date: Thu, 18 Mar 2010 09:48:39 +0000 Subject: [PATCH] Fixed the priority some activities (convertToBaseFormat and updateBaseMetadata) for that the document is converted before to test that conversion has failed git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33849 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../scripts/OOoDocument_updateMetadata.xml | 4 +++- .../document_interaction_workflow/scripts/upload.xml | 4 +++- bt5/erp5_dms/bt/revision | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) 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 af1935de2f..e96a63e955 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 @@ -84,7 +84,8 @@ if document.hasBaseData():\n new_metadata[metadata_key] = value\n if new_metadata:\n # edit metadata via server\n - document.activate().Document_tryToUpdateBaseMetadata(**new_metadata)\n + after_tag = \'document_%s_convert\' % document.getPath()\n + document.activate(after_tag=after_tag).Document_tryToUpdateBaseMetadata(**new_metadata)\n ]]></string> </value> @@ -140,6 +141,7 @@ if document.hasBaseData():\n <string>str</string> <string>metadata_key</string> <string>_write_</string> + <string>after_tag</string> <string>_apply_</string> </tuple> </value> 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 d6d516a808..0b402d6768 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 @@ -63,7 +63,8 @@ if document.hasBaseData():\n if document.getParentValue().getPortalType() != \'Contribution Tool\' \\\n and document.isSupportBaseDataConversion():\n document.processFile()\n - document.activate().Document_tryToConvertToBaseFormat()\n + tag = \'document_%s_convert\' % document.getPath()\n + document.activate(tag=tag).Document_tryToConvertToBaseFormat()\n </string> </value> </item> <item> @@ -104,6 +105,7 @@ if document.getParentValue().getPortalType() != \'Contribution Tool\' \\\n <string>_getitem_</string> <string>document</string> <string>_getattr_</string> + <string>tag</string> </tuple> </value> </item> diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 87e831c318..dab082fe2f 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -1094 \ No newline at end of file +1095 \ No newline at end of file -- 2.30.9