[Erp5-report] r24863 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Dec 11 13:56:22 2008
New Revision: 24863

URL: http://svn.erp5.org?rev=24863&view=rev
Log:
since portal_workflow.getWorkflowsFor() is protected, use Base.getWorkflowStateItemList() instead.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistory.xml
    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_getWorkflowHistory.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistory.xml?rev=24863&r1=24862&r2=24863&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistory.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistory.xml [utf8] Thu Dec 11 13:56:22 2008
@@ -62,7 +62,7 @@
 history = {}\n
 \n
 portal_workflow = context.getPortalObject().portal_workflow\n
-workflow_id_list = [x.getId() for x in portal_workflow.getWorkflowsFor(context)]\n
+workflow_id_list = [workflow_id for workflow_id, workflow_state in context.getWorkflowStateItemList()]\n
 \n
 for history_name in history_name_list:\n
   \n
@@ -148,7 +148,8 @@
                             <string>append</string>
                             <string>$append0</string>
                             <string>_getiter_</string>
-                            <string>x</string>
+                            <string>workflow_id</string>
+                            <string>workflow_state</string>
                             <string>workflow_id_list</string>
                             <string>history_name</string>
                             <string>wf_id</string>

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=24863&r1=24862&r2=24863&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] Thu Dec 11 13:56:22 2008
@@ -62,7 +62,7 @@
 i = 1\n
 portal_object = context.getPortalObject()\n
 portal_workflow = portal_object.portal_workflow\n
-workflow_id_list = [x.getId() for x in portal_workflow.getWorkflowsFor(context)]\n
+workflow_id_list = [workflow_id for workflow_id, workflow_state in context.getWorkflowStateItemList()]\n
 if not workflow_id in workflow_id_list:\n
   return []\n
 # Get history\n
@@ -194,7 +194,7 @@
                             <string>append</string>
                             <string>$append0</string>
                             <string>_getiter_</string>
-                            <string>x</string>
+                            <string>workflow_state</string>
                             <string>workflow_id_list</string>
                             <string>history_name</string>
                             <string>workflow_item_list</string>
@@ -213,6 +213,7 @@
                             <string>compatibility_name</string>
                             <string>len</string>
                             <string>same_type</string>
+                            <string>x</string>
                             <string>getattr</string>
                           </tuple>
                         </value>

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=24863&r1=24862&r2=24863&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Thu Dec 11 13:56:22 2008
@@ -1,1 +1,1 @@
-1035
+1036