From 5d49e9456f8e271523ca749e4bd55c3640c9247e Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Tue, 4 Nov 2025 10:41:24 -0400 Subject: [PATCH 1/2] Solving iframe issue --- ProcessMaker/Http/Controllers/TaskController.php | 3 ++- resources/views/tasks/edit.blade.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ProcessMaker/Http/Controllers/TaskController.php b/ProcessMaker/Http/Controllers/TaskController.php index 1195c1d59a..882367b724 100755 --- a/ProcessMaker/Http/Controllers/TaskController.php +++ b/ProcessMaker/Http/Controllers/TaskController.php @@ -140,7 +140,7 @@ public function edit(ProcessRequestToken $task, string $preview = '') $element = $task->getDefinition(true); $screenFields = $screenVersion ? $screenVersion->screenFilteredFields() : []; $taskDraftsEnabled = TaskDraft::draftsEnabled(); - + $is_smart_extract_task = $task->element_name === 'Manual Document Review'; // Remove screen parent to reduce the size of the response $screen = $task->screen; $screen['parent'] = null; @@ -205,6 +205,7 @@ public function edit(ProcessRequestToken $task, string $preview = '') 'taskDraftsEnabled' => $taskDraftsEnabled, 'userConfiguration' => $userConfiguration, 'hitlEnabled' => config('smart-extract.hitl_enabled', false), + 'is_smart_extract_task' => $is_smart_extract_task, ]); } } diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php index c4d9725ec1..cedd4d79eb 100644 --- a/resources/views/tasks/edit.blade.php +++ b/resources/views/tasks/edit.blade.php @@ -87,7 +87,7 @@ class="nav-link">
@can('update', $task) - @unless($hitlEnabled) + @unless($hitlEnabled && $is_smart_extract_task) Date: Tue, 4 Nov 2025 08:47:02 -0600 Subject: [PATCH 2/2] standardize variable naming and simplify HITL condition in task edit view --- ProcessMaker/Http/Controllers/TaskController.php | 5 ++--- resources/views/tasks/edit.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ProcessMaker/Http/Controllers/TaskController.php b/ProcessMaker/Http/Controllers/TaskController.php index 882367b724..81da99326f 100755 --- a/ProcessMaker/Http/Controllers/TaskController.php +++ b/ProcessMaker/Http/Controllers/TaskController.php @@ -140,7 +140,7 @@ public function edit(ProcessRequestToken $task, string $preview = '') $element = $task->getDefinition(true); $screenFields = $screenVersion ? $screenVersion->screenFilteredFields() : []; $taskDraftsEnabled = TaskDraft::draftsEnabled(); - $is_smart_extract_task = $task->element_name === 'Manual Document Review'; + $isSmartExtractTask = $task->element_name === 'Manual Document Review'; // Remove screen parent to reduce the size of the response $screen = $task->screen; $screen['parent'] = null; @@ -204,8 +204,7 @@ public function edit(ProcessRequestToken $task, string $preview = '') 'screenFields' => $screenFields, 'taskDraftsEnabled' => $taskDraftsEnabled, 'userConfiguration' => $userConfiguration, - 'hitlEnabled' => config('smart-extract.hitl_enabled', false), - 'is_smart_extract_task' => $is_smart_extract_task, + 'hitlEnabled' => config('smart-extract.hitl_enabled', false) && $isSmartExtractTask, ]); } } diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php index cedd4d79eb..783d474af3 100644 --- a/resources/views/tasks/edit.blade.php +++ b/resources/views/tasks/edit.blade.php @@ -87,7 +87,7 @@ class="nav-link">
@can('update', $task) - @unless($hitlEnabled && $is_smart_extract_task) + @unless($hitlEnabled) @else - @include('tasks.partials.hitl-iframe') + @include('tasks.partials.hitl-iframe') @endunless @endcan