diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml index 544892b4445c82330fd0a44502ed18bfb9318141..fd98fdf3704bb65e59797dd56b7b908554391e58 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml @@ -66,12 +66,15 @@ <item> <key> <string>_body</string> </key> <value> <string>from Products.ERP5.Document.Document import ConversionError\n +from ZODB.POSException import ConflictError\n from xmlrpclib import Fault\n from socket import error as SocketError\n \n message = None\n try:\n return context.convertToBaseFormat()\n +except ConflictError:\n + raise\n except ConversionError, e:\n message = \'Conversion Error: %s\' % (str(e) or \'undefined.\')\n except Fault, e:\n @@ -132,6 +135,8 @@ return message\n <tuple> <string>Products.ERP5.Document.Document</string> <string>ConversionError</string> + <string>ZODB.POSException</string> + <string>ConflictError</string> <string>xmlrpclib</string> <string>Fault</string> <string>socket</string> @@ -163,6 +168,12 @@ return message\n <key> <string>id</string> </key> <value> <string>Document_tryToConvertToBaseFormat</string> </value> </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>warnings</string> </key> <value> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml index 1a9c00a69bfa3530eadcb03e4cc56575d4b2f38b..aa4277508828cd3eeee19d7806dc9ac40b379d9d 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml @@ -65,11 +65,14 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>from Products.ERP5.Document.Document import ConversionError\n + <value> <string>from ZODB.POSException import ConflictError\n +from Products.ERP5.Document.Document import ConversionError\n \n message = None\n try:\n return context.updateBaseMetadata(**kw)\n +except ConflictError:\n + raise\n except ConversionError, e:\n message = \'Conversion Error: %s\' % (str(e) or \'undefined.\')\n except Exception, e:\n @@ -125,6 +128,8 @@ return message\n <value> <tuple> <string>kw</string> + <string>ZODB.POSException</string> + <string>ConflictError</string> <string>Products.ERP5.Document.Document</string> <string>ConversionError</string> <string>None</string> @@ -154,6 +159,12 @@ return message\n <key> <string>id</string> </key> <value> <string>Document_tryToUpdateBaseMetadata</string> </value> </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>warnings</string> </key> <value> diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 17a2ddadb417dddcaa67cd070f8ce236ebd052d4..11758cc31471de3fb956dc3e15c485dc6366d7cb 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -907 \ No newline at end of file +909 \ No newline at end of file