[Erp5-report] r12020 - in /erp5/trunk/products/ERP5/bootstrap: erp5_mysql_innodb_catalog/Ca...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Jan 11 14:44:49 2007
New Revision: 12020

URL: http://svn.erp5.org?rev=12020&view=rev
Log:
revert 11958 select_expression is needed for listbox (see testConfigure)


Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
    erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml?rev=12020&r1=12019&r2=12020&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml Thu Jan 11 14:44:49 2007
@@ -144,6 +144,9 @@
 
 SELECT\n
   COUNT(DISTINCT catalog.uid) <dtml-comment>We need subselect for better statistics</dtml-comment>\n
+<dtml-if select_expression>\n
+  , <dtml-var select_expression>\n
+</dtml-if>\n
 FROM\n
   <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
   <dtml-if selection_domain>\n
@@ -219,6 +222,9 @@
 
 SELECT\n
   COUNT(DISTINCT catalog.uid) <dtml-comment>We need subselect for better statistics</dtml-comment>\n
+<dtml-if select_expression>\n
+  , <dtml-var select_expression>\n
+</dtml-if>\n
 FROM\n
   <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
   <dtml-if selection_domain>\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision?rev=12020&r1=12019&r2=12020&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision Thu Jan 11 14:44:49 2007
@@ -1,1 +1,1 @@
-12
+13

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml?rev=12020&r1=12019&r2=12020&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml Thu Jan 11 14:44:49 2007
@@ -136,6 +136,9 @@
 
 SELECT\n
   COUNT(DISTINCT catalog.uid) <dtml-comment>We need subselect for better statistics</dtml-comment>\n
+<dtml-if select_expression>\n
+  , <dtml-var select_expression>\n
+</dtml-if>\n
 FROM\n
   <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
   <dtml-if selection_domain>\n
@@ -207,6 +210,9 @@
 
 SELECT\n
   COUNT(DISTINCT catalog.uid) <dtml-comment>We need subselect for better statistics</dtml-comment>\n
+<dtml-if select_expression>\n
+  , <dtml-var select_expression>\n
+</dtml-if>\n
 FROM\n
   <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
   <dtml-if selection_domain>\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/bt/revision?rev=12020&r1=12019&r2=12020&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/bt/revision Thu Jan 11 14:44:49 2007
@@ -1,1 +1,1 @@
-26
+27