Use future tracking list as fallback only if explicit argument is passed.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45594 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getAffectationList.xml

@@ -52,6 +52,8 @@
             <key> <string>_body</string> </key>
             <value> <string>"""Helper script used by many scripts Item_get*(Value|Title) used for UI\n
 It helps to improve consistency between all those scripts\n
+\n
+ fallback_on_future: if True return future Tracking List if current Tracking List is empty\n
 """\n
 portal = context.getPortalObject()\n
 \n
@@ -65,7 +67,7 @@ sql_kw = {\'item\': context.getRelativeUrl(),\n
 \n
 affectation_list = portal.portal_simulation.getCurrentTrackingList(**sql_kw)\n
 \n
-if not affectation_list:\n
+if fallback_on_future and not affectation_list:\n
   if default_at_date:\n
     del sql_kw[\'at_date\']\n
   affectation_list = portal.portal_simulation.getFutureTrackingList(**sql_kw)\n
@@ -75,7 +77,7 @@ return affectation_list\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>at_date=None, **kw</string> </value>
+            <value> <string>at_date=None, fallback_on_future=False, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginTitle.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>current_site = context.Item_getCurrentOriginValue(at_date=at_date)\n
+            <value> <string>current_site = context.Item_getCurrentOriginValue(**kw)\n
 if current_site is not None:\n
   return current_site.getSourceTitle()\n
 return None\n
@@ -58,7 +58,7 @@ return None\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>at_date=None</string> </value>
+            <value> <string>**kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml

@@ -56,7 +56,7 @@ last_affectation_list = context.Item_getAffectationList(**kw)\n
 if not last_affectation_list:\n
   return None\n
 \n
-if last_affectation_list[-1].node_uid is not None:\n
+if last_affectation_list[-1].delivery_uid is not None:\n
   site = portal.portal_catalog.getObject(last_affectation_list[-1].delivery_uid)\n
   return site\n
 </string> </value>

bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>resource = context.Item_getResourceValue(at_date=at_date)\n
+            <value> <string>resource = context.Item_getResourceValue(**kw)\n
 if resource is not None:\n
   return resource.getTitle()\n
 return None\n
@@ -58,7 +58,7 @@ return None\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>at_date=None</string> </value>
+            <value> <string>**kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_item/bt/revision

-288
+289
\ No newline at end of file