[Erp5-report] r19305 - in /erp5/trunk/bt5/erp5_crm: WorkflowTemplateItem/portal_workflow/ti...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Feb 13 21:07:04 2008
New Revision: 19305

URL: http://svn.erp5.org?rev=19305&view=rev
Log:
Call the generic script Base_checkConsistency, which deals properly with translation of ValidationFailed

Modified:
    erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/scripts/checkConsistency.xml
    erp5/trunk/bt5/erp5_crm/bt/revision

Modified: erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/scripts/checkConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/scripts/checkConsistency.xml?rev=19305&r1=19304&r2=19305&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/scripts/checkConsistency.xml (original)
+++ erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/scripts/checkConsistency.xml Wed Feb 13 21:07:04 2008
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -68,19 +65,8 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
-object = state_change[\'object\']\n
-N_ = object.Base_translateString\n
-\n
-check_result = object.checkConsistency()\n
-\n
-if len(check_result) > 0:\n
-  raise ValidationFailed, N_(check_result[0][-1])\n
-
-
-]]></string> </value>
+            <value> <string>state_change[\'object\'].Base_checkConsistency()\n
+</string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -123,14 +109,8 @@
                         <value>
                           <tuple>
                             <string>state_change</string>
-                            <string>Products.DCWorkflow.DCWorkflow</string>
-                            <string>ValidationFailed</string>
+                            <string>_getattr_</string>
                             <string>_getitem_</string>
-                            <string>object</string>
-                            <string>_getattr_</string>
-                            <string>N_</string>
-                            <string>check_result</string>
-                            <string>len</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_crm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/bt/revision?rev=19305&r1=19304&r2=19305&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/bt/revision (original)
+++ erp5/trunk/bt5/erp5_crm/bt/revision Wed Feb 13 21:07:04 2008
@@ -1,1 +1,1 @@
-147
+148