status-im/spiff-arena
2
0
Fork 0
mirror of https://github.com/status-im/spiff-arena.git synced 2025-03-01 01:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/save_to_task_data

Browse Source
This commit is contained in:
burnettk 2023-03-16 12:12:31 -04:00
commit c305fa90a8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py
View File

@ -404,10 +404,10 @@ class ProcessInstanceReportService:
) )
if report_filter.process_initiator_username is not None: if report_filter.process_initiator_username is not None:
user = UserModel.query.filter_by(username=report_filter.process_initiator_username).first() initiator = UserModel.query.filter_by(username=report_filter.process_initiator_username).first()
process_initiator_id = -1 process_initiator_id = -1
if user: if initiator:
process_initiator_id = user.id process_initiator_id = initiator.id
process_instance_query = process_instance_query.filter_by(process_initiator_id=process_initiator_id) process_instance_query = process_instance_query.filter_by(process_initiator_id=process_initiator_id)
if ( if (

5
spiffworkflow-frontend/src/routes/ProcessInstanceLogList.tsx
View File

@ -29,6 +29,11 @@ export default function ProcessInstanceLogList({ variant }: OwnProps) {
} }
useEffect(() => { useEffect(() => {
// Clear out any previous results to avoid a "flicker" effect where columns
// are updated above the incorrect data.
setProcessInstanceLogs([]);
setPagination(null);
const setProcessInstanceLogListFromResult = (result: any) => { const setProcessInstanceLogListFromResult = (result: any) => {
setProcessInstanceLogs(result.results); setProcessInstanceLogs(result.results);
setPagination(result.pagination); setPagination(result.pagination);