[Erp5-report] r22628 - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5_dms/...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Jul 23 14:05:11 2008
New Revision: 22628

URL: http://svn.erp5.org?rev=22628&view=rev
Log:
reraise ConflictErrors

Modified:
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml
    erp5/trunk/bt5/erp5_dms/bt/revision

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml?rev=22628&r1=22627&r2=22628&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.xml Wed Jul 23 14:05:11 2008
@@ -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 @@
                           <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>
@@ -164,6 +169,12 @@
             <value> <string>Document_tryToConvertToBaseFormat</string> </value>
         </item>
         <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
             <key> <string>warnings</string> </key>
             <value>
               <tuple/>

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml?rev=22628&r1=22627&r2=22628&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml Wed Jul 23 14:05:11 2008
@@ -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 @@
                         <value>
                           <tuple>
                             <string>kw</string>
+                            <string>ZODB.POSException</string>
+                            <string>ConflictError</string>
                             <string>Products.ERP5.Document.Document</string>
                             <string>ConversionError</string>
                             <string>None</string>
@@ -155,6 +160,12 @@
             <value> <string>Document_tryToUpdateBaseMetadata</string> </value>
         </item>
         <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
             <key> <string>warnings</string> </key>
             <value>
               <tuple/>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=22628&r1=22627&r2=22628&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Wed Jul 23 14:05:11 2008
@@ -1,1 +1,1 @@
-907
+909