From 2e5d3a29a8b7826b4cb4a1bacc2f98e48ac799ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Tue, 18 Sep 2007 12:12:15 +0000 Subject: [PATCH] Take security into account for stat, otherwise this can display deleted lines git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16440 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...onModule_zGetAccountingTransactionList.xml | 58 +++++++++---------- bt5/erp5_accounting/bt/revision | 2 +- 2 files changed, 29 insertions(+), 31 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 ddb2db0eb6..11b1152a5d 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> @@ -410,8 +410,7 @@ search_result_keys=\'\'</string> </value> <key> <string>src</string> </key> <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), **selection_params)">\n +<dtml-let query="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 @@ -596,8 +595,7 @@ WHERE\n <key> <string>raw</string> </key> <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), **selection_params)">\n +<dtml-let query="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 57db2e9786..5587802b4e 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -404 \ No newline at end of file +405 \ No newline at end of file -- 2.30.9