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

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed Feb  3 14:18:09 2010
New Revision: 32228

URL: http://svn.erp5.org?rev=32228&view=rev
Log:
Store the state_id on each items, usefull for merging or filtering feature.
reviewed by Seb

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=32228&r1=32227&r2=32228&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] Wed Feb  3 14:18:09 2010
@@ -111,11 +111,15 @@
         # Display the workflow state in the state columns\n
         key = key[len(compatibility_name):]\n
     if key.endswith(\'state\'): \n
+      # Store locally the id of state, usefull for merging action and transition\n
+      state_id = wf_states.get(value, marker) and wf_states[value].id\n
+      o.setProperty(\'state_id\', state_id)\n
+\n
       key = \'state\'\n
       if display:\n
         value = wf_states.get(value, marker) and wf_states[value].title\n
       else:\n
-        value = wf_states.get(value, marker) and wf_states[value].id\n
+        value = state_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
@@ -247,6 +251,7 @@
                             <string>value</string>
                             <string>compatibility_name</string>
                             <string>len</string>
+                            <string>state_id</string>
                             <string>same_type</string>
                             <string>getattr</string>
                           </tuple>

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=32228&r1=32227&r2=32228&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Wed Feb  3 14:18:09 2010
@@ -1,1 +1,1 @@
-1457
+1458