[Erp5-report] r42425 nicolas - in /erp5/trunk/bt5/erp5_item: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Jan 18 17:04:56 2011
New Revision: 42425

URL: http://svn.erp5.org?rev=42425&view=rev
Log:
Fallback on getFutureTrackingList of not available in current tracking

Modified:
    erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml
    erp5/trunk/bt5/erp5_item/bt/revision

Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml?rev=42425&r1=42424&r2=42425&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml [utf8] Tue Jan 18 17:04:56 2011
@@ -50,19 +50,22 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>from DateTime import DateTime\n
+            <value> <string>portal = context.getPortalObject()\n
 \n
 if at_date is None:\n
   at_date = DateTime()\n
 \n
-last_affectation_list = context.portal_simulation.getCurrentTrackingList(\n
+last_affectation_list = portal.portal_simulation.getCurrentTrackingList(\n
                             item=context.getRelativeUrl(), at_date=at_date)\n
 \n
-if len(last_affectation_list) == 0:\n
+if not last_affectation_list:\n
+  last_affectation_list = portal.portal_simulation.getFutureTrackingList(\n
+                            item=context.getRelativeUrl())\n
+if not last_affectation_list:\n
   return None\n
 \n
 if last_affectation_list[0].node_uid is not None:\n
-  site = context.portal_catalog.getObject(last_affectation_list[0].node_uid)\n
+  site = portal.portal_catalog.getObject(last_affectation_list[0].node_uid)\n
   return site\n
 \n
 return None\n

Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=42425&r1=42424&r2=42425&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Tue Jan 18 17:04:56 2011
@@ -1 +1 @@
-278
\ No newline at end of file
+279
\ No newline at end of file