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

[nobody at svn.erp5.org]

Author: jerome
Date: Wed May 26 17:46:52 2010
New Revision: 35652

URL: http://svn.erp5.org?rev=35652&view=rev
Log:
handle select expression like in catalog's search_results. This repairs a regression in change state dialog

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=35652&r1=35651&r2=35652&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] Wed May 26 17:46:52 2010
@@ -231,12 +231,6 @@
                                 </value>
                             </item>
                             <item>
-                                <key> <string>select_expression</string> </key>
-                                <value>
-                                  <dictionary/>
-                                </value>
-                            </item>
-                            <item>
                                 <key> <string>selection</string> </key>
                                 <value>
                                   <dictionary/>
@@ -333,7 +327,6 @@
                             <string>selection_domain</string>
                             <string>selection_report</string>
                             <string>selection_params</string>
-                            <string>select_expression</string>
                             <string>from_date</string>
                             <string>at_date</string>
                             <string>to_date</string>
@@ -379,7 +372,6 @@
 selection_domain\r\n
 selection_report\r\n
 selection_params=""\r\n
-select_expression\r\n
 from_date=""\r\n
 at_date=""\r\n
 to_date=""\r\n
@@ -463,7 +455,8 @@
       <dtml-elif count>\n
         COUNT(DISTINCT catalog.uid) AS count\n
       <dtml-else>\n
-        <dtml-if select_expression><dtml-var select_expression>\n
+        <dtml-in "portal_catalog.getSQLCatalog().getCatalogSearchResultKeys()"> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n
+        <dtml-if "query[\'select_expression\']">,<dtml-var "query[\'select_expression\']">\n
         <dtml-else>\n
         DISTINCT\n
         <dtml-in "search_result_keys">\n
@@ -641,7 +634,8 @@
           SELECT COUNT(DISTINCT uid) AS count FROM (\n
         <dtml-else>\n
           SELECT\n
-          <dtml-if select_expression><dtml-var select_expression>\n
+          <dtml-in "portal_catalog.getSQLCatalog().getCatalogSearchResultKeys()"> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n
+          <dtml-if "query[\'select_expression\']">,<dtml-var "query[\'select_expression\']">\n
           <dtml-else>\n
            catalog.*,\n
           ( SELECT title FROM catalog as mirror_catalog WHERE mirror_catalog.uid=catalog.delivery_mirror_section_uid ) AS delivery_mirror_section_title,\n
@@ -1130,7 +1124,8 @@
       <dtml-elif count>\n
         COUNT(DISTINCT catalog.uid) AS count\n
       <dtml-else>\n
-        <dtml-if select_expression><dtml-var select_expression>\n
+        <dtml-in "portal_catalog.getSQLCatalog().getCatalogSearchResultKeys()"> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n
+        <dtml-if "query[\'select_expression\']">,<dtml-var "query[\'select_expression\']">\n
         <dtml-else>\n
         DISTINCT\n
         <dtml-in "search_result_keys">\n
@@ -1308,7 +1303,8 @@
           SELECT COUNT(DISTINCT uid) AS count FROM (\n
         <dtml-else>\n
           SELECT\n
-          <dtml-if select_expression><dtml-var select_expression>\n
+          <dtml-in "portal_catalog.getSQLCatalog().getCatalogSearchResultKeys()"> <dtml-var sequence-item><dtml-if sequence-end> <dtml-else>, </dtml-if> </dtml-in>\n
+          <dtml-if "query[\'select_expression\']">,<dtml-var "query[\'select_expression\']">\n
           <dtml-else>\n
            catalog.*,\n
           ( SELECT title FROM catalog as mirror_catalog WHERE mirror_catalog.uid=catalog.delivery_mirror_section_uid ) AS delivery_mirror_section_title,\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=35652&r1=35651&r2=35652&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Wed May 26 17:46:52 2010
@@ -1,1 +1,1 @@
-1226
+1227