matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve event trigger workflow selection. Fix duplicate transitions trigger.

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-08-24 04:51:10 -04:00
parent 3fe0d47126
commit 85bc613d04
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mayan/apps/document_states/handlers.py
View File

@@ -18,6 +18,9 @@ def handler_index_document(sender, **kwargs):
def handler_trigger_transition(sender, **kwargs):
action = kwargs['instance']
Document = apps.get_model(
app_label='documents', model_name='Document'
)
WorkflowInstance = apps.get_model(
app_label='document_states', model_name='WorkflowInstance'
)
@@ -25,12 +28,23 @@ def handler_trigger_transition(sender, **kwargs):
app_label='document_states', model_name='WorkflowTransition'
)
for transition in WorkflowTransition.objects.filter(trigger_events__event_type__name=kwargs['instance'].verb):
for workflow_instance in WorkflowInstance.objects.filter(workflow__transitions=transition, document=action.target):
workflow_instance.do_transition(
comment=_('Event trigger: %s') % Event.get(name=action.verb).label,
transition=transition
)
trigger_transitions = WorkflowTransition.objects.filter(trigger_events__event_type__name=kwargs['instance'].verb)
if isinstance(action.target, Document):
workflow_instances = WorkflowInstance.objects.filter(workflow__transitions__in=trigger_transitions, document=action.target).distinct()
elif isinstance(action.action_object, Document):
workflow_instances = WorkflowInstance.objects.filter(workflow__transitions__in=trigger_transitions, document=action.action_object).distinct()
else:
workflow_instances = WorkflowInstance.objects.none()
for workflow_instance in workflow_instances:
# Select the first transition that is valid for this workflow state
transition = list(set(trigger_transitions) & set(workflow_instance.get_transition_choices()))[0]
workflow_instance.do_transition(
comment=_('Event trigger: %s') % Event.get(name=action.verb).label,
transition=transition
)
def launch_workflow(sender, instance, created, **kwargs):