[Erp5-report] r45391 vincent - in /erp5/trunk/bt5/erp5_banking_core: SkinTemplateItem/porta...

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Apr 13 18:22:10 2011
New Revision: 45391

URL: http://svn.erp5.org?rev=45391&view=rev
Log:
Make Baobab_matchUserFunction accept a list of functions as parameter.

Modified:
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_matchUserFunction.xml
    erp5/trunk/bt5/erp5_banking_core/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_matchUserFunction.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_matchUserFunction.xml?rev=45391&r1=45390&r2=45391&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_matchUserFunction.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_matchUserFunction.xml [utf8] Wed Apr 13 18:22:10 2011
@@ -51,9 +51,6 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>allow = False\n
-\n
-#context.log(\'group_list\',group_list)\n
-\n
 def match(criterion_list, reference_list):\n
   for criterion in criterion_list:\n
     if criterion in reference_list:\n
@@ -63,22 +60,21 @@ def match(criterion_list, reference_list
 if not allow and role_list is not None:\n
   from AccessControl import getSecurityManager\n
   roles = getSecurityManager().getUser().getRoles()\n
-  #context.log(\'roles\',roles)\n
   allow = match(roles, role_list)\n
 \n
-if not allow and group_list is not None:\n
+if not allow and function_list is not None or group_list is not None:\n
+  if function_list is None:\n
+    function_list = []\n
+  if group_list is not None:\n
+    function_list.extend(context.Baobab_getFunctionList(group_list=group_list))\n
   user_function_list = context.Baobab_getUserAssignedFunctionList()\n
-  function_list = context.Baobab_getFunctionList(group_list=group_list)\n
-  #context.log(\'user_function_list\',user_function_list)\n
-  #context.log(\'function_list\',function_list)\n
   allow = match(user_function_list, function_list)\n
-#context.log(\'allow\',allow)\n
 return allow\n
 </string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>group_list=None, role_list=None</string> </value>
+            <value> <string>group_list=None, role_list=None, function_list=None</string> </value>
         </item>
         <item>
             <key> <string>_proxy_roles</string> </key>

Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=45391&r1=45390&r2=45391&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision [utf8] Wed Apr 13 18:22:10 2011
@@ -1 +1 @@
-566
+567
\ No newline at end of file