From cce41fae44590f3478e50f574685885f8c2cec33 Mon Sep 17 00:00:00 2001 From: Dave MacFarlane Date: Wed, 5 Apr 2023 12:46:29 -0400 Subject: [PATCH] [conflict_resolver/candidate_profile] Fix loading of conflict widget The conflict resolver wasn't being compiled, causing the candidate profile of any candidate with conflicts to not load. This fixes the issue so that the page now loads. Resolves #8568 --- src/Middleware/ExceptionHandlingMiddleware.php | 1 + webpack.config.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Middleware/ExceptionHandlingMiddleware.php b/src/Middleware/ExceptionHandlingMiddleware.php index 5f14aa07fe6..d008541f3dc 100644 --- a/src/Middleware/ExceptionHandlingMiddleware.php +++ b/src/Middleware/ExceptionHandlingMiddleware.php @@ -36,6 +36,7 @@ public function process( ) : ResponseInterface { // Catch PHP Fatal errors that aren't exceptions such as type errors // or out of memory errors + return $handler->handle($request); register_shutdown_function( function () { $error = error_get_last(); diff --git a/webpack.config.js b/webpack.config.js index 45b37eb5487..ec250690cac 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -258,7 +258,7 @@ const lorisModules = { 'ConsentWidget', ], configuration: ['CohortRelations', 'configuration_helper'], - conflict_resolver: ['conflict_resolver'], + conflict_resolver: ['conflict_resolver', 'CandidateConflictsWidget'], battery_manager: ['batteryManagerIndex'], bvl_feedback: ['react.behavioural_feedback_panel'], behavioural_qc: ['behaviouralQCIndex'],