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

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Apr 20 15:39:14 CEST 2011 

Author: nicolas
Date: Wed Apr 20 15:39:13 2011
New Revision: 45594

URL: http://svn.erp5.org?rev=45594&view=rev
Log:
Use future tracking list as fallback only if explicit argument is passed.

Modified:
    erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getAffectationList.xml
    erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginTitle.xml
    erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml
    erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml
    erp5/trunk/bt5/erp5_item/bt/revision

Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getAffectationList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getAffectationList.xml?rev=45594&r1=45593&r2=45594&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getAffectationList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getAffectationList.xml [utf8] Wed Apr 20 15:39:13 2011
@@ -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.getRelativeU
 \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>

Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginTitle.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginTitle.xml?rev=45594&r1=45593&r2=45594&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginTitle.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginTitle.xml [utf8] Wed Apr 20 15:39:13 2011
@@ -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>

Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml?rev=45594&r1=45593&r2=45594&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml [utf8] Wed Apr 20 15:39:13 2011
@@ -56,7 +56,7 @@ last_affectation_list = context.Item_get
 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>

Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml?rev=45594&r1=45593&r2=45594&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml [utf8] Wed Apr 20 15:39:13 2011
@@ -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>

Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=45594&r1=45593&r2=45594&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Wed Apr 20 15:39:13 2011
@@ -1 +1 @@
-288
\ No newline at end of file
+289
\ No newline at end of file

More information about the Erp5-report mailing list