[Erp5-report] r34016 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Mar 23 17:25:52 2010
New Revision: 34016

URL: http://svn.erp5.org?rev=34016&view=rev
Log:
apply the limit to both parts of the UNION, but only for the first page (impossible to do this for next pages)

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml?rev=34016&r1=34015&r2=34016&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml [utf8] Tue Mar 23 17:25:52 2010
@@ -811,6 +811,12 @@
             )\n
           </dtml-if>\n
 \n
+          <dtml-if "not (count or stat) and query[\'limit_expression\'] and query[\'limit_expression\'].startswith(\'0\')">\n
+            <dtml-if "query[\'order_by_expression\']">\n
+              ORDER BY <dtml-var "query[\'order_by_expression\'].split(\'.\')[-1]">\n
+            </dtml-if>\n
+            LIMIT <dtml-var "query[\'limit_expression\']">\n
+          </dtml-if>\n
         )\n
 \n
 \n
@@ -991,6 +997,14 @@
               </dtml-in>\n
             )\n
           </dtml-if>\n
+\n
+          <dtml-if "not (count or stat) and query[\'limit_expression\'] and query[\'limit_expression\'].startswith(\'0\')">\n
+            <dtml-if "query[\'order_by_expression\']">\n
+              ORDER BY <dtml-var "query[\'order_by_expression\'].split(\'.\')[-1]">\n
+            </dtml-if>\n
+            LIMIT <dtml-var "query[\'limit_expression\']">\n
+          </dtml-if>\n
+\n
         )\n
 \n
 \n
@@ -1456,6 +1470,12 @@
             )\n
           </dtml-if>\n
 \n
+          <dtml-if "not (count or stat) and query[\'limit_expression\'] and query[\'limit_expression\'].startswith(\'0\')">\n
+            <dtml-if "query[\'order_by_expression\']">\n
+              ORDER BY <dtml-var "query[\'order_by_expression\'].split(\'.\')[-1]">\n
+            </dtml-if>\n
+            LIMIT <dtml-var "query[\'limit_expression\']">\n
+          </dtml-if>\n
         )\n
 \n
 \n
@@ -1636,6 +1656,14 @@
               </dtml-in>\n
             )\n
           </dtml-if>\n
+\n
+          <dtml-if "not (count or stat) and query[\'limit_expression\'] and query[\'limit_expression\'].startswith(\'0\')">\n
+            <dtml-if "query[\'order_by_expression\']">\n
+              ORDER BY <dtml-var "query[\'order_by_expression\'].split(\'.\')[-1]">\n
+            </dtml-if>\n
+            LIMIT <dtml-var "query[\'limit_expression\']">\n
+          </dtml-if>\n
+\n
         )\n
 \n
 \n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=34016&r1=34015&r2=34016&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Tue Mar 23 17:25:52 2010
@@ -1,1 +1,1 @@
-1142
+1146