From 73165b921c9e34c90d677208a48272b37b7ee4f4 Mon Sep 17 00:00:00 2001
From: Sebastien Robin <seb@nexedi.com>
Date: Mon, 12 Feb 2007 16:56:12 +0000
Subject: [PATCH] - remove the limit to 1000, it is provided by default by
ERP5Catalog, so this make the limit=None parameter working fine. - also
finish to commit change of jp about reversing the order between group by and
order by
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12633 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_mysql_innodb/z_search_results.xml | 50 +++++++++----------
.../erp5_mysql_innodb_catalog/bt/revision | 2 +-
2 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml
index da86569656..6e7805e104 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml
@@ -104,16 +104,16 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>selection</string>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>where_expression</string>
- <string>select_expression</string>
- <string>group_by_expression</string>
- <string>from_table_list</string>
- <string>sort_on</string>
- <string>limit_expression</string>
- <string>search_mode</string>
+<string>selection</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>where_expression</string>
+<string>select_expression</string>
+<string>group_by_expression</string>
+<string>from_table_list</string>
+<string>sort_on</string>
+<string>limit_expression</string>
+<string>search_mode</string>
</list>
</value>
</item>
@@ -130,15 +130,15 @@
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>selection\n
-selection_domain\n
-selection_report\n
-where_expression\n
-select_expression\n
-group_by_expression\n
-from_table_list:list\n
-sort_on\n
-limit_expression\n
+ <value> <string>selection\r\n
+selection_domain\r\n
+selection_report\r\n
+where_expression\r\n
+select_expression\r\n
+group_by_expression\r\n
+from_table_list:list\r\n
+sort_on\r\n
+limit_expression\r\n
search_mode</string> </value>
</item>
<item>
@@ -211,18 +211,16 @@ WHERE \n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
-<dtml-if sort_on>\n
-ORDER BY\n
- <dtml-var sort_on>\n
-</dtml-if>\n
<dtml-if group_by_expression>\n
GROUP BY\n
<dtml-var group_by_expression>\n
</dtml-if>\n
+<dtml-if sort_on>\n
+ORDER BY\n
+ <dtml-var sort_on>\n
+</dtml-if>\n
<dtml-if limit_expression>\n
LIMIT <dtml-var "limit_expression">\n
-<dtml-else>\n
-LIMIT 1000\n
</dtml-if>\n
@@ -304,8 +302,6 @@ ORDER BY\n
</dtml-if>\n
<dtml-if limit_expression>\n
LIMIT <dtml-var "limit_expression">\n
-<dtml-else>\n
-LIMIT 1000\n
</dtml-if>\n
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
index 368f89ceef..d99e90eb96 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
@@ -1 +1 @@
-28
\ No newline at end of file
+29
\ No newline at end of file
--
2.30.9