From 8fb9c8e9713778ca67b97979dd79e7f6d0c99852 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Thu, 25 Mar 2010 09:43:19 +0000 Subject: [PATCH] similar to r34086, for call pack() only if transition is possible. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34088 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../scripts/PackingList_calculatePacking.xml | 10 +++++++--- bt5/erp5_trade/bt/revision | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts/PackingList_calculatePacking.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts/PackingList_calculatePacking.xml index c0ac27db5b..e8d73e2470 100644 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts/PackingList_calculatePacking.xml +++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts/PackingList_calculatePacking.xml @@ -54,10 +54,13 @@ <item> <key> <string>_body</string> </key> <value> <string>packing_list = state_change[\'object\']\n +isTransitionPossible = packing_list.getPortalObject().portal_workflow.isTransitionPossible\n if packing_list.isPacked():\n - packing_list.pack()\n -elif packing_list.getPortalObject().portal_workflow.isTransitionPossible(packing_list, \'miss\'):\n - packing_list.miss()\n + if isTransitionPossible(packing_list, \'pack\'):\n + packing_list.pack()\n +else:\n + if isTransitionPossible(packing_list, \'miss\'):\n + packing_list.miss()\n </string> </value> </item> <item> @@ -99,6 +102,7 @@ elif packing_list.getPortalObject().portal_workflow.isTransitionPossible(packing <string>_getitem_</string> <string>packing_list</string> <string>_getattr_</string> + <string>isTransitionPossible</string> </tuple> </value> </item> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 6a806a9a43..d4f7b8f432 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -885 \ No newline at end of file +886 \ No newline at end of file -- 2.30.9