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

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Nov  4 17:47:19 2010
New Revision: 39920

URL: http://svn.erp5.org?rev=39920&view=rev
Log:
improve script

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

Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.xml?rev=39920&r1=39919&r2=39920&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.xml [utf8] Thu Nov  4 17:47:19 2010
@@ -50,12 +50,16 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>if context.Item_getResourceValue() != None:\n
-  result = context.Item_getResourceValue() and context.Item_getResourceValue().getQuantityUnitList() and [(\'\', \'\')] + [(x.getTranslatedLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in context.Item_getResourceValue().getQuantityUnitValueList()] or [(\'\', \'\')]\n
+            <value> <string>resource_value = context.Item_getResourceValue()\n
+movement_value = context.getAggregateRelatedValue()\n
 \n
-else:\n
-  result = [(x.getTranslatedLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in context.getAggregateRelatedValue().getQuantityUnitValueList()] or [(\'\', \'\')]\n
-return result\n
+result_item_list = [(\'\', \'\')]\n
+if resource_value is not None:\n
+  result_item_list.extend([(x.getTranslatedLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in resource_value.getQuantityUnitValueList()])\n
+elif movement_value is not None:\n
+  result_item_list.extend([(x.getTranslatedLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in movement_value.getQuantityUnitValueList()])\n
+\n
+return result_item_list\n
 </string> </value>
         </item>
         <item>
@@ -94,12 +98,14 @@ return result\n
                           <tuple>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>resource_value</string>
+                            <string>movement_value</string>
+                            <string>result_item_list</string>
                             <string>None</string>
                             <string>append</string>
                             <string>$append0</string>
                             <string>_getiter_</string>
                             <string>x</string>
-                            <string>result</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=39920&r1=39919&r2=39920&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Thu Nov  4 17:47:19 2010
@@ -1 +1 @@
-212
\ No newline at end of file
+216
\ No newline at end of file