[Erp5-report] r29527 - /erp5/trunk/products/ERP5Type/patches/DCWorkflow.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Oct  9 15:24:17 2009
New Revision: 29527

URL: http://svn.erp5.org?rev=29527&view=rev
Log:
Do not cast roles to tuple if one of other workflows use a list type

Modified:
    erp5/trunk/products/ERP5Type/patches/DCWorkflow.py

Modified: erp5/trunk/products/ERP5Type/patches/DCWorkflow.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/DCWorkflow.py?rev=29527&r1=29526&r2=29527&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/DCWorkflow.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/DCWorkflow.py [utf8] Fri Oct  9 15:24:17 2009
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
@@ -476,6 +477,7 @@
             roles = []
             refused_roles = []
             role_type = 'list'
+            other_role_type_list = []
             if sdef.permission_roles is not None:
                 roles = sdef.permission_roles.get(p, roles)
                 if type(roles) is type(()):
@@ -487,14 +489,17 @@
               if p in other_workflow.permissions:
                 other_roles = other_sdef.permission_roles.get(p, [])
                 if type(other_roles) is type(()) :
-                  role_type = 'tuple'
+                  other_role_type_list.append('tuple')
+                else:
+                  other_role_type_list.append('list')
                 for role in roles:
                   if role not in other_roles :
                     refused_roles.append(role)
             for role in refused_roles :
               if role in roles :
                 roles.remove(role)
-            if role_type=='tuple':
+            if role_type == 'tuple' and ((not other_role_type_list) or ('list' not in other_role_type_list)):
+              #If at least, one of other workflows manage security and for all are role_type are tuple
               roles = tuple(roles)
             if modifyRolesForPermission(ob, p, roles):
                 changed = 1