sartography/spiffworkflow-backend
1
0
Fork 0
mirror of https://github.com/sartography/spiffworkflow-backend.git synced 2025-02-24 13:28:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved merge conflicts w/ burnettk

Browse Source
This commit is contained in:
jasquat 2022-10-25 17:10:14 -04:00
parent 6b9c248b03
commit 2f3332040f
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/spiffworkflow_backend/services/process_instance_processor.py
View File

@ -540,11 +540,7 @@ class ProcessInstanceProcessor:
self.raise_if_no_potential_owners( self.raise_if_no_potential_owners(
potential_owner_ids, potential_owner_ids,
f"No users found in task data lane owner list for lane: {task_lane}. " f"No users found in task data lane owner list for lane: {task_lane}. "
<<<<<<< Updated upstream
f"The user list used: {task.data['lane_owners'][task_lane]}", f"The user list used: {task.data['lane_owners'][task_lane]}",
=======
f"The user list used: {task.data['lane_owners'][task_lane]}"
>>>>>>> Stashed changes
) )
else: else:
group_model = GroupModel.query.filter_by(identifier=task_lane).first() group_model = GroupModel.query.filter_by(identifier=task_lane).first()
@ -558,14 +554,10 @@ class ProcessInstanceProcessor:
i.user_id for i in group_model.user_group_assignments i.user_id for i in group_model.user_group_assignments
] ]
lane_assignment_id = group_model.id lane_assignment_id = group_model.id
<<<<<<< Updated upstream
self.raise_if_no_potential_owners( self.raise_if_no_potential_owners(
potential_owner_ids, potential_owner_ids,
f"Could not find any users in group to assign to lane: {task_lane}", f"Could not find any users in group to assign to lane: {task_lane}",
) )
=======
self.raise_if_no_potential_owners(potential_owner_ids, f"Could not find any users in group to assign to lane: {task_lane}")
>>>>>>> Stashed changes
return { return {
"potential_owner_ids": potential_owner_ids, "potential_owner_ids": potential_owner_ids,
@ -605,14 +597,9 @@ class ProcessInstanceProcessor:
# filter out non-usertasks # filter out non-usertasks
task_spec = ready_or_waiting_task.task_spec task_spec = ready_or_waiting_task.task_spec
if not self.bpmn_process_instance._is_engine_task(task_spec): if not self.bpmn_process_instance._is_engine_task(task_spec):
<<<<<<< Updated upstream
potential_owner_hash = self.get_potential_owner_ids_from_task( potential_owner_hash = self.get_potential_owner_ids_from_task(
ready_or_waiting_task ready_or_waiting_task
) )
=======
print(f"ready_or_waiting_task.data['current_user']['id']: {ready_or_waiting_task.data['current_user']['id']}")
potential_owner_hash = self.get_potential_owner_ids_from_task(ready_or_waiting_task)
>>>>>>> Stashed changes
extensions = ready_or_waiting_task.task_spec.extensions extensions = ready_or_waiting_task.task_spec.extensions
form_file_name = None form_file_name = None