diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py index 3de0319ec..0f62a7381 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py @@ -455,9 +455,9 @@ class ProcessInstanceReportService: instance_metadata_aliases = {} stock_columns = ProcessInstanceReportService.get_column_names_for_model(ProcessInstanceModel) - if report_filter.report_column_list: + if isinstance(report_filter.report_column_list, list): process_instance_report.report_metadata["columns"] = report_filter.report_column_list - if report_filter.report_filter_by_list: + if isinstance(report_filter.report_filter_by_list, list): process_instance_report.report_metadata["filter_by"] = report_filter.report_filter_by_list for column in process_instance_report.report_metadata["columns"]: diff --git a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx index 41c32aa49..eb4f17bf0 100644 --- a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx +++ b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx @@ -1273,7 +1273,7 @@ export default function ProcessInstanceListTable({ data-qa="filter-button" className="narrow-button" > - Filter + Apply @@ -1483,7 +1483,7 @@ export default function ProcessInstanceListTable({ if (requiresRefilter) { refilterTextComponent = (

- * Please press the filter button when you have completed updating the + * Please press the Apply button when you have completed updating the filters.

);