[Erp5-report] r40419 jm - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateIte...

[nobody at svn.erp5.org]

Author: jm
Date: Fri Nov 19 14:49:23 2010
New Revision: 40419

URL: http://svn.erp5.org?rev=40419&view=rev
Log:
ERP5Site_checkDataWithScript: return active process if created and make it callable from everywhere

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkDataWithScript.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkDataWithScript.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkDataWithScript.xml?rev=40419&r1=40418&r2=40419&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkDataWithScript.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkDataWithScript.xml [utf8] Fri Nov 19 14:49:23 2010
@@ -74,6 +74,7 @@ considered if id_list is None.\n
 """\n
 from Products.ERP5Type.Log import log\n
 document = context.getPortalObject()\n
+context = document.portal_activities\n
 if relative_url:\n
   document = document.restrictedTraverse(relative_url)\n
   depth = len(relative_url.split(\'/\'))\n
@@ -132,8 +133,9 @@ else:\n
         except (TypeError, IndexError):\n
           pass\n
 \n
+  result = None\n
   if active_process is None:\n
-    active_process = context.newActiveProcess().getPath()\n
+    result = active_process = context.newActiveProcess().getPath()\n
   kw = dict(relative_url=relative_url, active_process=active_process,\n
             tag=tag, full=full, recursive=recursive, packet=packet,\n
             method_id=method_id, method_kw=method_kw)\n
@@ -146,6 +148,8 @@ else:\n
     else:\n
       kw[\'id_list\'] = tuple(id_list[i:i+packet])\n
     activate(priority=4).ERP5Site_checkDataWithScript(**kw)\n
+  # return the active process path if we created one\n
+  return result\n
 
 
 ]]></string> </value>
@@ -220,6 +224,7 @@ else:\n
                             <string>_inplacevar_</string>
                             <string>TypeError</string>
                             <string>IndexError</string>
+                            <string>result</string>
                             <string>dict</string>
                             <string>kw</string>
                             <string>i</string>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=40419&r1=40418&r2=40419&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Fri Nov 19 14:49:23 2010
@@ -1 +1 @@
-1789
\ No newline at end of file
+1790
\ No newline at end of file