Commit d6b0ea3d authored by Jérome Perrin's avatar Jérome Perrin

don't patch Guard class directly, because it's also used for workflow

transitions.



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14426 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 29299c93
...@@ -56,10 +56,16 @@ def WorkflowUIMixin_setProperties( self, title ...@@ -56,10 +56,16 @@ def WorkflowUIMixin_setProperties( self, title
WorkflowUIMixin_class.setProperties = WorkflowUIMixin_setProperties WorkflowUIMixin_class.setProperties = WorkflowUIMixin_setProperties
WorkflowUIMixin_class.manage_properties = DTMLFile('workflow_properties', _dtmldir) WorkflowUIMixin_class.manage_properties = DTMLFile('workflow_properties', _dtmldir)
def Guard_check(self, sm, wf_def, ob, **kw):
def Guard_checkWithoutRoles(self, sm, wf_def, ob, **kw):
"""Checks conditions in this guard. """Checks conditions in this guard.
This method was patched so that roles are not taken This function is the same as Guard.check, but roles are not taken
into account here (but taken into account as local roles) into account here (but taken into account as local roles). This version
is for worklist guards.
Note that this patched version is not a monkey patch on the class,
because we only want this specific behaviour for worklists (Guards are
also used in transitions).
""" """
u_roles = None u_roles = None
if wf_def.manager_bypass: if wf_def.manager_bypass:
...@@ -98,8 +104,6 @@ def Guard_check(self, sm, wf_def, ob, **kw): ...@@ -98,8 +104,6 @@ def Guard_check(self, sm, wf_def, ob, **kw):
return 1 return 1
Guard.check = Guard_check
def DCWorkflowDefinition_listGlobalActions(self, info): def DCWorkflowDefinition_listGlobalActions(self, info):
''' '''
Allows this workflow to Allows this workflow to
...@@ -133,7 +137,8 @@ def DCWorkflowDefinition_listGlobalActions(self, info): ...@@ -133,7 +137,8 @@ def DCWorkflowDefinition_listGlobalActions(self, info):
# Patch for ERP5 by JP Smets in order # Patch for ERP5 by JP Smets in order
# to take into account the expression of the guard # to take into account the expression of the guard
# and nothing else - ERP5Workflow definitely needed some day # and nothing else - ERP5Workflow definitely needed some day
if guard is None or guard.check(sm, self, portal): if guard is None or Guard_checkWithoutRoles(
guard, sm, self, portal):
dict = {} dict = {}
# Patch for ERP5 by JP Smets in order # Patch for ERP5 by JP Smets in order
# to implement worklists and search of local roles # to implement worklists and search of local 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