[Erp5-report] r16838 - in /erp5/trunk/bt5/erp5_dms: WorkflowTemplateItem/portal_workflow/do...

[nobody at svn.erp5.org]

Author: bartek
Date: Thu Oct  4 19:40:40 2007
New Revision: 16838

URL: http://svn.erp5.org?rev=16838&view=rev
Log:
Bugfix - interaction workflow tried to convert temporary documents through activities.

Modified:
    erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml
    erp5/trunk/bt5/erp5_dms/bt/revision

Modified: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml?rev=16838&r1=16837&r2=16838&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml (original)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/upload.xml Thu Oct  4 19:40:40 2007
@@ -68,8 +68,14 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>state_change[\'object\'].uploadFile()\n
-state_change[\'object\'].activate().convertToBaseFormat()\n
+            <value> <string>object = state_change[\'object\']\n
+object.uploadFile()\n
+\n
+# do not activate conversion if the object is in portal_contributions\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
 </string> </value>
         </item>
         <item>
@@ -119,8 +125,9 @@
                         <value>
                           <tuple>
                             <string>state_change</string>
+                            <string>_getitem_</string>
+                            <string>object</string>
                             <string>_getattr_</string>
-                            <string>_getitem_</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=16838&r1=16837&r2=16838&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Thu Oct  4 19:40:40 2007
@@ -1,1 +1,1 @@
-695
+696