[Erp5-report] r31307 nicolas - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTempla...

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Dec 15 13:22:10 2009
New Revision: 31307

URL: http://svn.erp5.org?rev=31307&view=rev
Log:
Store action_id on items returned by Base_getWorkflowHistoryItemList in order to support merging of action and transition.
reviewed by romain

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml?rev=31307&r1=31306&r2=31307&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml [utf8] Tue Dec 15 13:22:10 2009
@@ -117,6 +117,8 @@
       else:\n
         value = wf_states.get(value, marker) and wf_states[value].id\n
     if key == \'action\':\n
+      # Store locally the id of action, usefull for merging action and transition\n
+      o.setProperty(\'action_id\', value)\n
       if value != \'\' and value is not None:\n
         if value == "\'edit\'":\n
           value = "edit"\n

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=31307&r1=31306&r2=31307&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Tue Dec 15 13:22:10 2009
@@ -1,1 +1,1 @@
-1399
+1403