From 2e4dc4546ee50b24ec5a497e3a35c453942b7c4a Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Thu, 11 Dec 2008 12:56:22 +0000
Subject: [PATCH] since portal_workflow.getWorkflowsFor() is protected, use
Base.getWorkflowStateItemList() instead.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24863 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_skins/erp5_core/Base_getWorkflowHistory.xml | 5 +++--
.../erp5_core/Base_getWorkflowHistoryItemList.xml | 5 +++--
product/ERP5/bootstrap/erp5_core/bt/revision | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistory.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistory.xml
index 7c37ea36e7..90a1f2b291 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistory.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistory.xml
@@ -62,7 +62,7 @@ history_name_list = [\'building_history\', \' installation_history\', \'history\
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 @@ return history\n
<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>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml
index 43730ac006..fb8f041913 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml
@@ -62,7 +62,7 @@ result = []\n
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 @@ return result\n
<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 @@ return result\n
<string>compatibility_name</string>
<string>len</string>
<string>same_type</string>
+ <string>x</string>
<string>getattr</string>
</tuple>
</value>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 09fef806d9..b25dcc8ec2 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1035
\ No newline at end of file
+1036
\ No newline at end of file
--
2.30.9