mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
resource instead of model
This commit is contained in:
1 parent
a2a29b529b
commit
a1a410c54d
1 file changed
+4
-2
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
|
use App\Http\Resources\SubTaskCollection;
|
||||||
|
use App\Http\Resources\SubTaskResource;
|
||||||
use App\Models\Attachment;
|
use App\Models\Attachment;
|
||||||
use App\Models\MasterTask;
|
use App\Models\MasterTask;
|
||||||
use App\Models\SubTask;
|
use App\Models\SubTask;
|
||||||
@@ -84,7 +86,7 @@ class SubTaskController extends Controller
|
|||||||
$subtasks = SubTask::where('user_id', $parameters['user_id'])->where('is_finished', 0)->whereDoesntHave( 'timeblocks')->get();
|
$subtasks = SubTask::where('user_id', $parameters['user_id'])->where('is_finished', 0)->whereDoesntHave( 'timeblocks')->get();
|
||||||
|
|
||||||
return response()->json( [
|
return response()->json( [
|
||||||
'subtasks' => $subtasks
|
'subtasks' => SubTaskResource::collection($subtasks)
|
||||||
], 200 );
|
], 200 );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,7 +107,7 @@ class SubTaskController extends Controller
|
|||||||
$subtasks = SubTask::where('user_id', $parameters['user_id'])->where('is_finished', 0)->get();
|
$subtasks = SubTask::where('user_id', $parameters['user_id'])->where('is_finished', 0)->get();
|
||||||
|
|
||||||
return response()->json( [
|
return response()->json( [
|
||||||
'subtasks' => $subtasks
|
'subtasks' => SubTaskResource::collection($subtasks)
|
||||||
], 200 );
|
], 200 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user