JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 22:39:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app

Browse Source
This commit is contained in:
Matej Glasnák committed 2023-02-17 16:19:19 +01:00
2 parents c69f022423 9fbc14b60d
commit a51cb13a47
2 files changed
+2 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

be/app/Http/Controllers/SubTaskController.php
+1 -1
View File
@@ -65,7 +65,7 @@ class SubTaskController extends Controller
} }
return response()->json([ return response()->json([
'subtasks' => $subtasks 'subtasks' => SubTaskResource::collection($subtasks)
], 200); ], 200);
} }
be/app/Http/Resources/SubTaskResource.php
+1
View File
@@ -29,6 +29,7 @@ class SubTaskResource extends JsonResource
'timeblocks' => TimeblockResource::collection($this->timeblocks), 'timeblocks' => TimeblockResource::collection($this->timeblocks),
'timesheets' => TimesheetResource::collection($this->timesheets), 'timesheets' => TimesheetResource::collection($this->timesheets),
'files' => AttachmentResource::collection($this->attachments), 'files' => AttachmentResource::collection($this->attachments),
'color' => $this->mastertask->color,
]; ];
} }