|
@@ -29,7 +29,9 @@ class TaskController extends Controller
|
|
|
$tasks = Task::query()
|
|
|
->where("parent_id", 0)
|
|
|
->with(['children', 'assignTo', 'createdBy'])
|
|
|
- ->filter($request->all())->paginate();
|
|
|
+ ->filter($request->all())
|
|
|
+ ->allowed()
|
|
|
+ ->paginate();
|
|
|
|
|
|
return TaskResource::collection($tasks);
|
|
|
}
|
|
@@ -53,7 +55,7 @@ class TaskController extends Controller
|
|
|
...$request->all(),
|
|
|
'company_id' => Auth::user()->company_id,
|
|
|
'created_by' => Auth::id(),
|
|
|
- 'whitelist' => $request->whitelist ? sprintf(",%s", implode(',', $request->whitelist)) : null,
|
|
|
+ 'whitelist' => $request->whitelist ? sprintf(",%s,", implode(',', $request->whitelist)) : null,
|
|
|
'asset_id' => $asset_id,
|
|
|
'requirement_group_id'=>$requirement_group_id,
|
|
|
];
|
|
@@ -73,7 +75,7 @@ class TaskController extends Controller
|
|
|
*/
|
|
|
public function show(string $id)
|
|
|
{
|
|
|
- $task = Task::query()->findOrFail($id);
|
|
|
+ $task = Task::query()->allowed($id)->findOrFail($id);
|
|
|
|
|
|
return new TaskDetailResource($task);
|
|
|
}
|
|
@@ -83,7 +85,7 @@ class TaskController extends Controller
|
|
|
*/
|
|
|
public function update(CreateOrUpdateRequest $request, string $id, CustomFieldRepository $customFieldRepo)
|
|
|
{
|
|
|
- $task = Task::query()->findOrFail($id);
|
|
|
+ $task = Task::query()->allowed($id)->findOrFail($id);
|
|
|
$asset_id=null;
|
|
|
|
|
|
if ($requirementId=$request->get('requirement_id')!=$task->requirement_id){
|
|
@@ -93,7 +95,7 @@ class TaskController extends Controller
|
|
|
}
|
|
|
|
|
|
$formData = [...$request->all(),
|
|
|
- 'whitelist' => $request->whitelist ? sprintf(",%s", implode(',', $request->whitelist)) : null,
|
|
|
+ 'whitelist' => $request->whitelist ? sprintf(",%s,", implode(',', $request->whitelist)) : null,
|
|
|
'$asset_id' => $asset_id,
|
|
|
];
|
|
|
|
|
@@ -113,7 +115,7 @@ class TaskController extends Controller
|
|
|
*/
|
|
|
public function destroy(string $id)
|
|
|
{
|
|
|
- $task = Task::query()->findOrFail($id);
|
|
|
+ $task = Task::query()->allowed($id)->findOrFail($id);
|
|
|
|
|
|
$task->delete();
|
|
|
|
|
@@ -122,7 +124,7 @@ class TaskController extends Controller
|
|
|
|
|
|
public function batchStore(BatchCreateRequest $request, CustomFieldRepository $customFieldRepo)
|
|
|
{
|
|
|
- $project = Project::query()->find($request->project_id);
|
|
|
+ $project = Project::query()->allowed($request->project_id)->find($request->project_id);
|
|
|
|
|
|
$parsedItems = [];
|
|
|
$previousItem = [];
|