From 7e2450fbd517c92ac835e64a7466519f40fa166a Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Thu, 18 Jan 2024 20:54:48 +0000 Subject: [PATCH 1/3] QA Observation fixed --- ProcessMaker/Http/Controllers/TaskController.php | 3 ++- resources/views/tasks/edit.blade.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ProcessMaker/Http/Controllers/TaskController.php b/ProcessMaker/Http/Controllers/TaskController.php index 41e7616d78..c3972f8469 100644 --- a/ProcessMaker/Http/Controllers/TaskController.php +++ b/ProcessMaker/Http/Controllers/TaskController.php @@ -110,7 +110,7 @@ public function edit(ProcessRequestToken $task, string $preview = '') } UserResourceView::setViewed(Auth::user(), $task); - + $currentUser = Auth::user()->only(['id', 'username', 'fullname', 'firstname', 'lastname', 'avatar']); return view('tasks.edit', [ 'task' => $task, 'dueLabels' => self::$dueLabels, @@ -120,6 +120,7 @@ public function edit(ProcessRequestToken $task, string $preview = '') 'addons' => $this->getPluginAddons('edit', []), 'assignedToAddons' => $this->getPluginAddons('edit.assignedTo', []), 'dataActionsAddons' => $this->getPluginAddons('edit.dataActions', []), + 'currentUser' => $currentUser, ]); } } diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php index ffb32af096..807fae6c0f 100644 --- a/resources/views/tasks/edit.blade.php +++ b/resources/views/tasks/edit.blade.php @@ -465,7 +465,8 @@ class="d-inline-flex pull-left align-items-center" window.ProcessMaker.isSelfService = this.isSelfService; } }); - window.ProcessMaker.breadcrumbs.taskTitle = @json($task->element_name) + window.ProcessMaker.breadcrumbs.taskTitle = @json($task->element_name); + window.Processmaker.user = @json($currentUser); @endsection From 7dc55bed8869d75cecdb859287d8d547a40838b0 Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Fri, 19 Jan 2024 15:09:37 +0000 Subject: [PATCH 2/3] Adding properties timezone and datetime_format in Task controller --- ProcessMaker/Http/Controllers/TaskController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProcessMaker/Http/Controllers/TaskController.php b/ProcessMaker/Http/Controllers/TaskController.php index c3972f8469..c55fbd770c 100644 --- a/ProcessMaker/Http/Controllers/TaskController.php +++ b/ProcessMaker/Http/Controllers/TaskController.php @@ -110,7 +110,7 @@ public function edit(ProcessRequestToken $task, string $preview = '') } UserResourceView::setViewed(Auth::user(), $task); - $currentUser = Auth::user()->only(['id', 'username', 'fullname', 'firstname', 'lastname', 'avatar']); + $currentUser = Auth::user()->only(['id', 'username', 'fullname', 'firstname', 'lastname', 'avatar', 'timezone', 'datetime_format']); return view('tasks.edit', [ 'task' => $task, 'dueLabels' => self::$dueLabels, From a96380436437bef20b8acd5d12fa7c4a8c3d4e45 Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Fri, 19 Jan 2024 15:17:13 +0000 Subject: [PATCH 3/3] Solving SonarQube observation spliting code under 120 characters --- ProcessMaker/Http/Controllers/TaskController.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ProcessMaker/Http/Controllers/TaskController.php b/ProcessMaker/Http/Controllers/TaskController.php index ca3d3f2b32..a0c8095bee 100644 --- a/ProcessMaker/Http/Controllers/TaskController.php +++ b/ProcessMaker/Http/Controllers/TaskController.php @@ -110,7 +110,16 @@ public function edit(ProcessRequestToken $task, string $preview = '') } UserResourceView::setViewed(Auth::user(), $task); - $currentUser = Auth::user()->only(['id', 'username', 'fullname', 'firstname', 'lastname', 'avatar', 'timezone', 'datetime_format']); + $currentUser = Auth::user()->only([ + 'id', + 'username', + 'fullname', + 'firstname', + 'lastname', + 'avatar', + 'timezone', + 'datetime_format' + ]); return view('tasks.edit', [ 'task' => $task, 'dueLabels' => self::$dueLabels,