Commit bad3e727 authored by Aurel's avatar Aurel

On the workflow define permission, 'acquire permission settings' is the

default value


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4414 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 406db0e4
...@@ -660,7 +660,6 @@ def updateRoleMappingsFor(self, ob): ...@@ -660,7 +660,6 @@ def updateRoleMappingsFor(self, ob):
other_sdef = other_workflow._getWorkflowStateOf(ob) other_sdef = other_workflow._getWorkflowStateOf(ob)
if other_sdef is not None and other_sdef.permission_roles is not None: if other_sdef is not None and other_sdef.permission_roles is not None:
other_data_list.append((other_workflow,other_sdef)) other_data_list.append((other_workflow,other_sdef))
# Be carefull, permissions_roles should not change # Be carefull, permissions_roles should not change
# from list to tuple or vice-versa. (in modifyRolesForPermission, # from list to tuple or vice-versa. (in modifyRolesForPermission,
# list means acquire roles, tuple means do not acquire) # list means acquire roles, tuple means do not acquire)
...@@ -679,7 +678,7 @@ def updateRoleMappingsFor(self, ob): ...@@ -679,7 +678,7 @@ def updateRoleMappingsFor(self, ob):
for other_workflow,other_sdef in other_data_list: for other_workflow,other_sdef in other_data_list:
if p in other_workflow.permissions: if p in other_workflow.permissions:
for role in roles: for role in roles:
other_roles = other_sdef.permission_roles.get(p, ()) other_roles = other_sdef.permission_roles.get(p, [])
if type(other_roles) is type(()) : if type(other_roles) is type(()) :
role_type = 'tuple' role_type = 'tuple'
if role not in other_roles : if role not in other_roles :
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment