[Erp5-report] r29204 - in /erp5/trunk/products/ERP5: bootstrap/erp5_core/SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Sep 28 14:03:02 2009
New Revision: 29204

URL: http://svn.erp5.org?rev=29204&view=rev
Log:
support limit= parameter in getMovementHistoryList

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
    erp5/trunk/products/ERP5/tests/testInventoryAPI.py

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml?rev=29204&r1=29203&r2=29204&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml [utf8] Mon Sep 28 14:03:02 2009
@@ -70,6 +70,12 @@
                                 </value>
                             </item>
                             <item>
+                                <key> <string>limit_expression</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                            <item>
                                 <key> <string>omit_input</string> </key>
                                 <value>
                                   <dictionary/>
@@ -151,6 +157,7 @@
                             <string>where_expression</string>
                             <string>order_by_expression</string>
                             <string>group_by_expression</string>
+                            <string>limit_expression</string>
                             <string>selection_domain</string>
                             <string>selection_report</string>
                             <string>ignore_variation</string>
@@ -587,6 +594,7 @@
 where_expression\r\n
 order_by_expression\r\n
 group_by_expression\r\n
+limit_expression\r\n
 selection_domain\r\n
 selection_report\r\n
 ignore_variation\r\n
@@ -758,6 +766,12 @@
 ORDER BY\n
   <dtml-var order_by_expression>\n
 </dtml-if>\n
+\n
+<dtml-if limit_expression>\n
+LIMIT\n
+  <dtml-var limit_expression>\n
+</dtml-if>\n
+\n
 ) AS q1\n
 
 
@@ -918,6 +932,12 @@
 ORDER BY\n
   <dtml-var order_by_expression>\n
 </dtml-if>\n
+\n
+<dtml-if limit_expression>\n
+LIMIT\n
+  <dtml-var limit_expression>\n
+</dtml-if>\n
+\n
 ) AS q1\n
 
 

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=29204&r1=29203&r2=29204&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Mon Sep 28 14:03:02 2009
@@ -1,1 +1,1 @@
-1308
+1309

Modified: erp5/trunk/products/ERP5/tests/testInventoryAPI.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInventoryAPI.py?rev=29204&r1=29203&r2=29204&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInventoryAPI.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testInventoryAPI.py [utf8] Mon Sep 28 14:03:02 2009
@@ -1228,15 +1228,12 @@
           getMovementHistoryList(section_uid=self.section.getUid(),
                                  sort_on=(('title', 'descending'),)) ])
 
-
-  # FIXME: do we want to include it or no ?
   def test_Limit(self):
-    return "is it part of this API ?" # XXX
-    getMovementHistoryList = self.getSimulationTool().getMovementHistoryList
-    for q in range(10):
+    getMovementHistoryList = self.getSimulationTool().getMovementHistoryList
+    for q in range(6):
       self._makeMovement(quantity=1)
-    self.assertEquals(3, len(getMovementHistoryList(list_start=2,
-                                                    list_lines=3)))
+    self.assertEquals(3, len(getMovementHistoryList(limit=3)))
+    self.assertEquals(4, len(getMovementHistoryList(limit=(1, 4))))
   
   def test_SimulationState(self):
     getMovementHistoryList = self.getSimulationTool().getMovementHistoryList