From bf323c29735809f47523e8e8a77bdd22f219895e Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Fri, 17 Feb 2023 09:38:11 +0100 Subject: [PATCH 1/2] no message --- be/app/Http/Controllers/SubTaskController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/be/app/Http/Controllers/SubTaskController.php b/be/app/Http/Controllers/SubTaskController.php index 04914c5..7619896 100644 --- a/be/app/Http/Controllers/SubTaskController.php +++ b/be/app/Http/Controllers/SubTaskController.php @@ -65,7 +65,7 @@ class SubTaskController extends Controller } return response()->json([ - 'subtasks' => $subtasks + 'subtasks' => SubTaskResource::collection($subtasks) ], 200); } @@ -188,7 +188,7 @@ class SubTaskController extends Controller // syncnutie timeblocks $subtask->syncTimeblocks($data['data']['timeblocks']); - + return response()->json([ 'message' => 'Subtask updated successfully', 'subtask' => new SubTaskResource($subtask) From 9fbc14b60d80873f66ea4ec19177199714f900dc Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Fri, 17 Feb 2023 15:49:34 +0100 Subject: [PATCH 2/2] no message --- be/app/Http/Resources/SubTaskResource.php | 1 + 1 file changed, 1 insertion(+) diff --git a/be/app/Http/Resources/SubTaskResource.php b/be/app/Http/Resources/SubTaskResource.php index 6f78154..7f0c9df 100644 --- a/be/app/Http/Resources/SubTaskResource.php +++ b/be/app/Http/Resources/SubTaskResource.php @@ -29,6 +29,7 @@ class SubTaskResource extends JsonResource 'timeblocks' => TimeblockResource::collection($this->timeblocks), 'timesheets' => TimesheetResource::collection($this->timesheets), 'files' => AttachmentResource::collection($this->attachments), + 'color' => $this->mastertask->color, ]; }