sartography
/
spiff-arena
mirror of https://github.com/sartography/spiff-arena.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing a stupid mistake.

This commit is contained in:
danfunk 2023-05-11 12:56:59 -04:00
parent 1ea4b7bc44
commit 127248be34
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
View File

@ -388,7 +388,6 @@ def _render_instructions_for_end_user(task_model: TaskModel, extensions: Optiona
def _interstitial_stream(process_instance: ProcessInstanceModel) -> Generator[str, Optional[str], None]:
def get_reportable_tasks() -> Any:
return processor.bpmn_process_instance.get_tasks(
TaskState.WAITING | TaskState.STARTED | TaskState.READY | TaskState.ERROR
@ -404,10 +403,6 @@ def _interstitial_stream(process_instance: ProcessInstanceModel) -> Generator[st
return_hash[return_type] = entity
return f"data: {current_app.json.dumps(return_hash)} \n\n"
# do not do any processing if the instance is not currently active
if process_instance.status not in ProcessInstanceModel.active_statuses():
yield render_data("unrunnable_instance", process_instance)
return
processor = ProcessInstanceProcessor(process_instance)
reported_ids = [] # A list of all the ids reported by this endpoint so far.
@ -430,6 +425,10 @@ def _interstitial_stream(process_instance: ProcessInstanceModel) -> Generator[st
yield render_data("task", task)
reported_ids.append(spiff_task.id)
if spiff_task.state == TaskState.READY:
# do not do any processing if the instance is not currently active
if process_instance.status not in ProcessInstanceModel.active_statuses():
yield render_data("unrunnable_instance", process_instance)
return
try:
processor.do_engine_steps(execution_strategy_name="one_at_a_time")
processor.do_engine_steps(execution_strategy_name="run_until_user_message")

2
spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
View File

@ -1602,7 +1602,7 @@ export default function ProcessInstanceListTable({
}
buttonElement = (
<Button kind='secondary' href={interstitialUrl}>
<Button kind="secondary" href={interstitialUrl}>
{buttonText}
</Button>
);