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

no message

Browse Source
This commit is contained in:
StudioTem committed 2023-03-21 11:16:12 +01:00
1 parent 4e3e98d058
commit 04c42c2762
2 files changed
+34 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

be/app/Http/Controllers/MasterTaskController.php
+12 -7
View File
@@ -57,16 +57,13 @@ class MasterTaskController extends Controller
'data.deadline' => 'required',
'data.project_id' => 'required',
'data.employees' => 'required',
'data.files' => 'max:51200',
],
['data.files.max' => 'File size must be less than 50MB']);
]);
if($validator->fails()){
return response()->json($validator->errors(), 400);
}
// validacia na max 50MB size pre attachmenty. neslo dat do klasickeho laravel validation, tak je to separe
if ($files = $request->file('data')['files']) {
foreach ( $files as $file ) {
if ($file->getSize() > 52428800)
@@ -114,14 +111,22 @@ class MasterTaskController extends Controller
'data.duration' => 'required',
'data.deadline' => 'required',
'data.project_id' => 'required',
'data.file' => 'max:51200',
],
['data.file.max' => 'File size must be less than 50MB']);
]);
if ($validator->fails()){
return response()->json($validator->errors(), 400);
}
// validacia na max 50MB size pre attachmenty. neslo dat do klasickeho laravel validation, tak je to separe
if ($files = $request->file('data')['files']) {
foreach ( $files as $file ) {
if ($file->getSize() > 52428800)
return response()->json([
'files' => 'File size must be less than 50MB',
], 400);
}
}
// upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka
$data['data'] = $request->all()['data'];
$data['data']['title'] = $request->all()['data']['name'];
be/app/Http/Controllers/SubTaskController.php
+22 -6
View File
@@ -128,9 +128,7 @@ class SubTaskController extends Controller
$validator = Validator::make($request->all(), [
'data.employee_id' => 'required',
'data.duration' => 'required',
'data.file' => 'max:51200',
],
['data.file.max' => 'File size must be less than 50MB']);
]);
// validacia, ci uz subtask pre tohto usera a mastertask neexistuje
$validator->after(function ($validator) use ($mastertask_id, $request) {
@@ -145,6 +143,16 @@ class SubTaskController extends Controller
return response()->json($validator->errors(), 400);
}
// validacia na max 50MB size pre attachmenty. neslo dat do klasickeho laravel validation, tak je to separe
if ($files = $request->file('data')['files']) {
foreach ( $files as $file ) {
if ($file->getSize() > 52428800)
return response()->json([
'files' => 'File size must be less than 50MB',
], 400);
}
}
// upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka
$data['data'] = $request->all()['data'];
$data['data']['user_id'] = $request->all()['data']['employee_id'];
@@ -193,14 +201,22 @@ class SubTaskController extends Controller
$validator = Validator::make($request->all(), [
'data.employee_id' => 'required',
'data.duration' => 'required',
'data.file' => 'max:51200',
],
['data.file.max' => 'File size must be less than 50MB']);
]);
if ($validator->fails()){
return response()->json($validator->errors(), 400);
}
// validacia na max 50MB size pre attachmenty. neslo dat do klasickeho laravel validation, tak je to separe
if ($files = $request->file('data')['files']) {
foreach ( $files as $file ) {
if ($file->getSize() > 52428800)
return response()->json([
'files' => 'File size must be less than 50MB',
], 400);
}
}
// upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka
$data['data'] = $request->all()['data'];
$data['data']['user_id'] = $request->all()['data']['employee_id'];