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

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

View File

@ -404,10 +404,10 @@ class ProcessInstanceReportService:
)
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
if user:
process_initiator_id = user.id
if initiator:
process_initiator_id = initiator.id
process_instance_query = process_instance_query.filter_by(process_initiator_id=process_initiator_id)
if (

View File

@ -29,6 +29,11 @@ export default function ProcessInstanceLogList({ variant }: OwnProps) {
}
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) => {
setProcessInstanceLogs(result.results);
setPagination(result.pagination);