[Erp5-report] r14277 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: WorkflowTemplateIt...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Apr 27 15:33:49 2007
New Revision: 14277

URL: http://svn.erp5.org?rev=3D14277&view=3Drev
Log:
Translating in a workflow script is a mistake. One should raise a Validatio=
nFailed with a Message instance so that translations is performed when the =
message is displayed, not when it's stored in the database.
Also use newer checkConsistency ConsistencyMessage API

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/porta=
l_workflow/validation_workflow/scripts/checkConsistency.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem=
/portal_workflow/validation_workflow/scripts/checkConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/Workf=
lowTemplateItem/portal_workflow/validation_workflow/scripts/checkConsistenc=
y.xml?rev=3D14277&r1=3D14276&r2=3D14277&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/porta=
l_workflow/validation_workflow/scripts/checkConsistency.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/porta=
l_workflow/validation_workflow/scripts/checkConsistency.xml Fri Apr 27 15:3=
3:49 2007
@@ -68,22 +68,19 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string encoding=3D"cdata"><![CDATA[
-
-from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
+            <value> <string>from Products.DCWorkflow.DCWorkflow import Val=
idationFailed\n
+from Products.ERP5Type.Message import Message\n
 object =3D state_change[\'object\']\n
-N_ =3D object.Base_translateString\n
 \n
 check_result =3D object.checkConsistency()\n
 \n
-if len(check_result) > 0:\n
-  check_type    =3D N_(check_result[0][-1])\n
-  # TODO: use nice url encoding method there instead of replace()\n
-  check_details =3D check_result[0][-2].replace(\'<\', \'&lt;\').replace(\=
'>\', \'&gt;\')\n
-  raise ValidationFailed, "%s : %s" % (check_type, check_details)\n
-
-
-]]></string> </value>
+if check_result:\n
+  err =3D check_result[0]\n
+  if hasattr(err, \'getTranslatedMessage\'):\n
+    raise ValidationFailed, err.getTranslatedMessage()\n
+  # backward compatibility:\n
+  raise ValidationFailed, "%s: %s" % (err[4], err[3])\n
+</string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -134,14 +131,14 @@
                             <string>state_change</string>
                             <string>Products.DCWorkflow.DCWorkflow</string>
                             <string>ValidationFailed</string>
+                            <string>Products.ERP5Type.Message</string>
+                            <string>Message</string>
                             <string>_getitem_</string>
                             <string>object</string>
                             <string>_getattr_</string>
-                            <string>N_</string>
                             <string>check_result</string>
-                            <string>len</string>
-                            <string>check_type</string>
-                            <string>check_details</string>
+                            <string>err</string>
+                            <string>hasattr</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/re=
vision?rev=3D14277&r1=3D14276&r2=3D14277&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Fri Apr 27 15:=
33:49 2007
@@ -1,1 +1,1 @@
-316
+317