[Erp5-report] r13304 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Mar  9 14:30:14 2007
New Revision: 13304

URL: http://svn.erp5.org?rev=13304&view=rev
Log:
portal_catalog.buildSQLQuery(allowedRolesAndUsers=portal_catalog.getAllowedRolesAndUsers())
is no longer working. Use portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery() instead.


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=13304&r1=13303&r2=13304&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml Fri Mar  9 14:30:14 2007
@@ -373,7 +373,9 @@
         </item>
         <item>
             <key> <string>connection_hook</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>connection_id</string> </key>
@@ -395,9 +397,8 @@
             <key> <string>src</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-<dtml-let allowed_roles_and_users="portal_catalog.getAllowedRolesAndUsers(**selection_params)">\n
-<dtml-comment>do something to have a query without RolesAndUsers security for global stats</dtml-comment>\n
-<dtml-let query="(stat) and portal_catalog.buildSQLQuery(**selection_params) or portal_catalog.buildSQLQuery(allowedRolesAndUsers=allowed_roles_and_users, **selection_params)">\n
+<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 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
@@ -541,7 +542,7 @@
     <dtml-unless no_limit>LIMIT 1000</dtml-unless>\n
   </dtml-if>\n
 </dtml-unless>\n
-</dtml-let></dtml-let></dtml-let></dtml-let>\n
+</dtml-let></dtml-let></dtml-let>\n
 <dtml-comment> vim: syntax=dtml\n
 </dtml-comment>\n
 
@@ -582,9 +583,8 @@
                         <key> <string>raw</string> </key>
                         <value> <string encoding="cdata"><![CDATA[
 
-<dtml-let allowed_roles_and_users="portal_catalog.getAllowedRolesAndUsers(**selection_params)">\n
-<dtml-comment>do something to have a query without RolesAndUsers security for global stats</dtml-comment>\n
-<dtml-let query="(stat) and portal_catalog.buildSQLQuery(**selection_params) or portal_catalog.buildSQLQuery(allowedRolesAndUsers=allowed_roles_and_users, **selection_params)">\n
+<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 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
@@ -728,7 +728,7 @@
     <dtml-unless no_limit>LIMIT 1000</dtml-unless>\n
   </dtml-if>\n
 </dtml-unless>\n
-</dtml-let></dtml-let></dtml-let></dtml-let>\n
+</dtml-let></dtml-let></dtml-let>\n
 <dtml-comment> vim: syntax=dtml\n
 </dtml-comment>\n
 

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=13304&r1=13303&r2=13304&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Fri Mar  9 14:30:14 2007
@@ -1,1 +1,1 @@
-203
+205