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
parent c5d049dd
...@@ -84,7 +84,8 @@ if document.hasBaseData():\n ...@@ -84,7 +84,8 @@ if document.hasBaseData():\n
new_metadata[metadata_key] = value\n new_metadata[metadata_key] = value\n
if new_metadata:\n if new_metadata:\n
# edit metadata via server\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> ]]></string> </value>
...@@ -140,6 +141,7 @@ if document.hasBaseData():\n ...@@ -140,6 +141,7 @@ if document.hasBaseData():\n
<string>str</string> <string>str</string>
<string>metadata_key</string> <string>metadata_key</string>
<string>_write_</string> <string>_write_</string>
<string>after_tag</string>
<string>_apply_</string> <string>_apply_</string>
</tuple> </tuple>
</value> </value>
......
...@@ -63,7 +63,8 @@ if document.hasBaseData():\n ...@@ -63,7 +63,8 @@ if document.hasBaseData():\n
if document.getParentValue().getPortalType() != \'Contribution Tool\' \\\n if document.getParentValue().getPortalType() != \'Contribution Tool\' \\\n
and document.isSupportBaseDataConversion():\n and document.isSupportBaseDataConversion():\n
document.processFile()\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> </string> </value>
</item> </item>
<item> <item>
...@@ -104,6 +105,7 @@ if document.getParentValue().getPortalType() != \'Contribution Tool\' \\\n ...@@ -104,6 +105,7 @@ if document.getParentValue().getPortalType() != \'Contribution Tool\' \\\n
<string>_getitem_</string> <string>_getitem_</string>
<string>document</string> <string>document</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>tag</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
1094 1095
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment