From 990ccb00452078534e5b4159ca7d53131603f431 Mon Sep 17 00:00:00 2001 From: Mame Coumba Sall <mame@nexedi.com> Date: Fri, 27 Feb 2009 16:21:40 +0000 Subject: [PATCH] 2009-02-27 mame * change it back to current tracking list git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25744 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_item/Item_getCurrentOwnerTitle.xml | 2 +- .../erp5_item/Item_getCurrentSiteValue.xml | 24 ------------------- .../erp5_item/Item_getResourceTitle.xml | 3 +-- .../erp5_item/Item_getResourceValue.xml | 2 +- bt5/erp5_item/bt/revision | 2 +- 5 files changed, 4 insertions(+), 29 deletions(-) diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerTitle.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerTitle.xml index f31c77ee56..3d97fe0365 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerTitle.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerTitle.xml @@ -56,7 +56,7 @@ <value> <string>from DateTime import DateTime\n \n date = DateTime()\n -last_affectation = context.portal_simulation.getTrackingList(item=context.getRelativeUrl(), at_date=date)\n +last_affectation = context.portal_simulation.getCurrentTrackingList(item=context.getRelativeUrl(), at_date=date)\n \n if len(last_affectation) == 0:\n return None\n diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml index 5f020684a8..f6ca71dc3a 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml @@ -9,22 +9,10 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>Python_magic</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>Script_magic</string> </key> <value> <int>3</int> </value> </item> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_bind_names</string> </key> <value> @@ -85,18 +73,6 @@ return None\n <none/> </value> </item> - <item> - <key> <string>_filepath</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml index 0f2dd6f50d..1e19f22fcb 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml @@ -53,8 +53,7 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>context.log(context.Item_getResourceValue())\n -if context.Item_getResourceValue() is not None:\n + <value> <string>if context.Item_getResourceValue() is not None:\n return context.Item_getResourceValue().getTitle()\n return \'\'\n </string> </value> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml index 71f438142f..463d1f9060 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml @@ -58,7 +58,7 @@ #kw[\'at_date\'] = DateTime()\n kw[\'item\'] = context.getRelativeUrl()\n \n -last_affectation_list = context.portal_simulation.getTrackingList(**kw)\n +last_affectation_list = context.portal_simulation.getCurrentTrackingList(**kw)\n \n if kw.get(\'src__\',0):\n return last_affectation_list\n diff --git a/bt5/erp5_item/bt/revision b/bt5/erp5_item/bt/revision index 4800c7da68..fc9afb48e0 100644 --- a/bt5/erp5_item/bt/revision +++ b/bt5/erp5_item/bt/revision @@ -1 +1 @@ -58 \ No newline at end of file +59 \ No newline at end of file -- 2.30.9