From 5dd9ff8df2c899a0fc11fc1bd4242558d295dfa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Mon, 14 May 2007 18:13:27 +0000
Subject: [PATCH] AccountingTransactionModule_zGetAccountingTransactionList:
pass **selection_params to getSecurityQuery, so that local_roles are taken
into account
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14489 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
...onModule_zGetAccountingTransactionList.xml | 56 +++++++++----------
bt5/erp5_accounting/bt/revision | 2 +-
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
index 7fc13a3328..b3ccf8a707 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
@@ -303,32 +303,32 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>selection</string>
- <string>selection_name</string>
- <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>
- <string>node</string>
- <string>resource</string>
- <string>entity</string>
- <string>stat</string>
- <string>omit_input</string>
- <string>omit_output</string>
- <string>amount</string>
- <string>amount_range_min</string>
- <string>amount_range_max</string>
- <string>creation_date_range_min</string>
- <string>creation_date_range_max</string>
- <string>section_category</string>
- <string>count</string>
- <string>transaction_uid</string>
- <string>specific_reference</string>
- <string>no_limit</string>
- <string>search_result_keys</string>
+<string>selection</string>
+<string>selection_name</string>
+<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>
+<string>node</string>
+<string>resource</string>
+<string>entity</string>
+<string>stat</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>amount</string>
+<string>amount_range_min</string>
+<string>amount_range_max</string>
+<string>creation_date_range_min</string>
+<string>creation_date_range_max</string>
+<string>section_category</string>
+<string>count</string>
+<string>transaction_uid</string>
+<string>specific_reference</string>
+<string>no_limit</string>
+<string>search_result_keys</string>
</list>
</value>
</item>
@@ -411,7 +411,7 @@ search_result_keys=\'\'</string> </value>
<value> <string encoding="cdata"><![CDATA[
<dtml-comment>global stat ignores security (which is not always good, eg when using worklists with local_roles</dtml-comment>\n
-<dtml-let query="(stat) and portal_catalog.buildSQLQuery(**selection_params) or portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(), **selection_params)">\n
+<dtml-let query="(stat) and portal_catalog.buildSQLQuery(**selection_params) or portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), **selection_params)">\n
<dtml-let search_result_keys="search_result_keys or portal_catalog.getCatalogSearchResultKeys()">\n
<dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max">\n
\n
@@ -597,7 +597,7 @@ WHERE\n
<value> <string encoding="cdata"><![CDATA[
<dtml-comment>global stat ignores security (which is not always good, eg when using worklists with local_roles</dtml-comment>\n
-<dtml-let query="(stat) and portal_catalog.buildSQLQuery(**selection_params) or portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(), **selection_params)">\n
+<dtml-let query="(stat) and portal_catalog.buildSQLQuery(**selection_params) or portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), **selection_params)">\n
<dtml-let search_result_keys="search_result_keys or portal_catalog.getCatalogSearchResultKeys()">\n
<dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max">\n
\n
diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision
index 2c136b29b5..55663e5ead 100644
--- a/bt5/erp5_accounting/bt/revision
+++ b/bt5/erp5_accounting/bt/revision
@@ -1 +1 @@
-302
\ No newline at end of file
+304
\ No newline at end of file
--
2.30.9