[Erp5-report] r9334 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: CatalogMethodTempla...

[nobody at svn.erp5.org]

Author: bartek
Date: Tue Aug 22 18:46:40 2006
New Revision: 9334

URL: http://svn.erp5.org?rev=9334&view=rev
Log:
return select_expression from z_search_result

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_search_results.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_search_results.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_search_results.xml?rev=9334&r1=9333&r2=9334&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_search_results.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_search_results.xml Tue Aug 22 18:46:40 2006
@@ -173,6 +173,7 @@
 
 SELECT DISTINCT\n
   <dtml-in getCatalogSearchResultKeys> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n
+  <dtml-if select_expression>,<dtml-var select_expression></dtml-if>\n
 \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
@@ -251,6 +252,7 @@
 
 SELECT DISTINCT\n
   <dtml-in getCatalogSearchResultKeys> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n
+  <dtml-if select_expression>,<dtml-var select_expression></dtml-if>\n
 \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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log?rev=9334&r1=9333&r2=9334&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log Tue Aug 22 18:46:40 2006
@@ -1,8 +1,5 @@
-2006-08-11 jerome
-* when copy/paste a person, reset the login on the new person for ERP5Security.
-
-2006-08-06 jerome
-* remove skins to create module using a scribus file; they are now part of erp5_pdf_editor.
+2006-08-22 bartek
+* return select_expression from z_search_result
 
 2006-07-21 aurel
 * register checked uid in selection in Base_callDialogMethod