From 03229ad91235506493f413afce6e4dff7094f433 Mon Sep 17 00:00:00 2001 From: Alain Takoudjou <talino@tiolive.com> Date: Thu, 2 Oct 2014 15:45:46 +0000 Subject: [PATCH] Post merge: fix OpenOrder_updateSimulation after cherry picked commits --- .../OpenOrder_updateSimulation.xml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenOrder_updateSimulation.xml b/bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenOrder_updateSimulation.xml index 4559a86510..75a1b015b8 100644 --- a/bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenOrder_updateSimulation.xml +++ b/bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenOrder_updateSimulation.xml @@ -50,17 +50,20 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>context.getPortalObject().portal_catalog.searchAndActivate(\n - parent_uid=context.getUid(),\n - method_id=\'OpenOrderLine_updateSimulation\',\n - method_kw={\'tag\': tag},\n - activate_kw={\'tag\':tag}\n -)\n + <value> <string>subscription_item_set = set()\n +\n +for open_order_line in context.objectValues():\n + for ob in [open_order_line] + open_order_line.getCellValueList():\n + for item in ob.getAggregateValueList():\n + if getattr(item.aq_explicit, \'updateSimulation\', None) is not None and \\\n + item not in subscription_item_set:\n + subscription_item_set.add(item)\n + item.updateSimulation(expand_root=1)\n </string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string>tag=None</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>_proxy_roles</string> </key> -- 2.30.9