[Erp5-report] r34620 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Apr 16 14:19:54 CEST 2010
Author: jerome
Date: Fri Apr 16 14:19:54 2010
New Revision: 34620
URL: http://svn.erp5.org?rev=34620&view=rev
Log:
fix various issues with sorting:
- impossible to search + sort on title or reference
- impossible to sort on specific_reference if no filter by section
- impossible to sort by more than one column
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=34620&r1=34619&r2=34620&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] Fri Apr 16 14:19:54 2010
@@ -472,6 +472,7 @@
</dtml-in>\n
, delivery.start_date as operation_date\n
, \'source\' as section_mark\n
+ , catalog.reference as specific_reference\n
</dtml-if>\n
</dtml-if>\n
\n
@@ -675,11 +676,11 @@
, catalog.*\n
<dtml-if "section_category">, category.uid as category_uid</dtml-if>\n
<dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
- <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n
- <dtml-if "not order_column in (\'operation_date\', \'specific_reference\')">\n
- ,<dtml-var "query[\'order_by_expression\'].split(\' \')[0]">\n
- </dtml-if>\n
- </dtml-let>\n
+ <dtml-in "query[\'order_by_expression\'].split(\', \')">\n
+ <dtml-unless "\'operation_date\' in _[\'sequence-item\'] or \'specific_reference\' in _[\'sequence-item\'] or \'`catalog`.\' in _[\'sequence-item\']">\n
+ , <dtml-var expr="_[\'sequence-item\'].split(\' \')[0]">\n
+ </dtml-unless>\n
+ </dtml-in>\n
</dtml-if>\n
</dtml-if>\n
\n
@@ -828,7 +829,7 @@
\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
+ ORDER BY <dtml-var "query[\'order_by_expression\']">\n
</dtml-if>\n
LIMIT <dtml-var "query[\'limit_expression\']">\n
</dtml-if>\n
@@ -863,11 +864,11 @@
, catalog.*\n
<dtml-if "section_category">, category.uid as category_uid</dtml-if>\n
<dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
- <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n
- <dtml-if "not order_column in (\'operation_date\', \'specific_reference\')">\n
- ,<dtml-var "query[\'order_by_expression\'].split(\' \')[0]">\n
- </dtml-if>\n
- </dtml-let>\n
+ <dtml-in "query[\'order_by_expression\'].split(\', \')">\n
+ <dtml-unless "\'operation_date\' in _[\'sequence-item\'] or \'specific_reference\' in _[\'sequence-item\'] or \'`catalog`.\' in _[\'sequence-item\']">\n
+ , <dtml-var expr="_[\'sequence-item\'].split(\' \')[0]">\n
+ </dtml-unless>\n
+ </dtml-in>\n
</dtml-if>\n
</dtml-if>\n
\n
@@ -1016,7 +1017,7 @@
\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
+ ORDER BY <dtml-var "query[\'order_by_expression\']">\n
</dtml-if>\n
LIMIT <dtml-var "query[\'limit_expression\']">\n
</dtml-if>\n
@@ -1045,7 +1046,14 @@
<dtml-if "not (stat or count)">\n
GROUP BY uid\n
<dtml-if "query[\'order_by_expression\']">\n
- ORDER BY <dtml-var "query[\'order_by_expression\'].split(\'.\')[-1]">\n
+ ORDER BY\n
+ <dtml-in "query[\'order_by_expression\'].split(\', \')">\n
+ <dtml-if "\'.\' in _[\'sequence-item\']">\n
+ <dtml-var expr="_[\'sequence-item\'].split(\'.\')[1]">\n
+ <dtml-else>\n
+ <dtml-var sequence-item>\n
+ </dtml-if><dtml-unless sequence-end>,</dtml-unless>\n
+ </dtml-in>\n
</dtml-if>\n
<dtml-if "query[\'limit_expression\']">\n
LIMIT <dtml-var "query[\'limit_expression\']">\n
@@ -1058,9 +1066,6 @@
</dtml-if>\n
\n
</dtml-if>\n
-\n
-\n
-\n
</dtml-let></dtml-let></dtml-let></dtml-let>\n
\n
<dtml-comment> vim: syntax=dtml\n
@@ -1134,6 +1139,7 @@
</dtml-in>\n
, delivery.start_date as operation_date\n
, \'source\' as section_mark\n
+ , catalog.reference as specific_reference\n
</dtml-if>\n
</dtml-if>\n
\n
@@ -1337,11 +1343,11 @@
, catalog.*\n
<dtml-if "section_category">, category.uid as category_uid</dtml-if>\n
<dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
- <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n
- <dtml-if "not order_column in (\'operation_date\', \'specific_reference\')">\n
- ,<dtml-var "query[\'order_by_expression\'].split(\' \')[0]">\n
- </dtml-if>\n
- </dtml-let>\n
+ <dtml-in "query[\'order_by_expression\'].split(\', \')">\n
+ <dtml-unless "\'operation_date\' in _[\'sequence-item\'] or \'specific_reference\' in _[\'sequence-item\'] or \'`catalog`.\' in _[\'sequence-item\']">\n
+ , <dtml-var expr="_[\'sequence-item\'].split(\' \')[0]">\n
+ </dtml-unless>\n
+ </dtml-in>\n
</dtml-if>\n
</dtml-if>\n
\n
@@ -1490,7 +1496,7 @@
\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
+ ORDER BY <dtml-var "query[\'order_by_expression\']">\n
</dtml-if>\n
LIMIT <dtml-var "query[\'limit_expression\']">\n
</dtml-if>\n
@@ -1525,11 +1531,11 @@
, catalog.*\n
<dtml-if "section_category">, category.uid as category_uid</dtml-if>\n
<dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
- <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n
- <dtml-if "not order_column in (\'operation_date\', \'specific_reference\')">\n
- ,<dtml-var "query[\'order_by_expression\'].split(\' \')[0]">\n
- </dtml-if>\n
- </dtml-let>\n
+ <dtml-in "query[\'order_by_expression\'].split(\', \')">\n
+ <dtml-unless "\'operation_date\' in _[\'sequence-item\'] or \'specific_reference\' in _[\'sequence-item\'] or \'`catalog`.\' in _[\'sequence-item\']">\n
+ , <dtml-var expr="_[\'sequence-item\'].split(\' \')[0]">\n
+ </dtml-unless>\n
+ </dtml-in>\n
</dtml-if>\n
</dtml-if>\n
\n
@@ -1678,7 +1684,7 @@
\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
+ ORDER BY <dtml-var "query[\'order_by_expression\']">\n
</dtml-if>\n
LIMIT <dtml-var "query[\'limit_expression\']">\n
</dtml-if>\n
@@ -1707,7 +1713,14 @@
<dtml-if "not (stat or count)">\n
GROUP BY uid\n
<dtml-if "query[\'order_by_expression\']">\n
- ORDER BY <dtml-var "query[\'order_by_expression\'].split(\'.\')[-1]">\n
+ ORDER BY\n
+ <dtml-in "query[\'order_by_expression\'].split(\', \')">\n
+ <dtml-if "\'.\' in _[\'sequence-item\']">\n
+ <dtml-var expr="_[\'sequence-item\'].split(\'.\')[1]">\n
+ <dtml-else>\n
+ <dtml-var sequence-item>\n
+ </dtml-if><dtml-unless sequence-end>,</dtml-unless>\n
+ </dtml-in>\n
</dtml-if>\n
<dtml-if "query[\'limit_expression\']">\n
LIMIT <dtml-var "query[\'limit_expression\']">\n
@@ -1720,9 +1733,6 @@
</dtml-if>\n
\n
</dtml-if>\n
-\n
-\n
-\n
</dtml-let></dtml-let></dtml-let></dtml-let>\n
\n
<dtml-comment> vim: syntax=dtml\n
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=34620&r1=34619&r2=34620&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Fri Apr 16 14:19:54 2010
@@ -1,1 +1,1 @@
-1188
+1190
More information about the Erp5-report
mailing list