Skip to content

Commit cc93096

Browse files
committed
fix: Fix validation
1 parent 192a739 commit cc93096

File tree

1 file changed

+24
-21
lines changed

1 file changed

+24
-21
lines changed

app/Http/Controllers/MediaController.php

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function index(Request $request){
4141

4242
public function folderAdd(Request $request){
4343
$validatedData = $request->validate([
44-
'thisFolder' => 'numeric'
44+
'thisFolder' => 'required|numeric'
4545
]);
4646
$mediaFolder = new Folder();
4747
$mediaFolder->name = 'New Folder';
@@ -55,7 +55,7 @@ public function folderAdd(Request $request){
5555
public function folderUpdate(Request $request){
5656
$validatedData = $request->validate([
5757
'name' => 'required|min:1|max:256',
58-
'id' => 'numeric'
58+
'id' => 'required|numeric'
5959
]);
6060
$thisFolder = Folder::where('id', '=', $request->input('id'))->first();
6161
$thisFolder->name = $request->input('name');
@@ -65,7 +65,7 @@ public function folderUpdate(Request $request){
6565

6666
public function folder(Request $request){
6767
$validatedData = $request->validate([
68-
'id' => 'numeric',
68+
'id' => 'required|numeric',
6969
]);
7070
$thisFolder = Folder::where('id', '=', $request->input('id'))->first();
7171
return response()->json(array(
@@ -76,8 +76,9 @@ public function folder(Request $request){
7676

7777
public function folderMove(Request $request){
7878
$validatedData = $request->validate([
79-
'id' => 'numeric',
80-
'thisFolder' => 'numeric'
79+
'id' => 'required|numeric',
80+
'thisFolder' => 'required|numeric',
81+
'folder' => 'required'
8182
]);
8283
if($request->input('id') != $request->input('folder')){
8384
$thisFolder = Folder::where('id', '=', $request->input('id'))->first();
@@ -95,7 +96,8 @@ public function folderMove(Request $request){
9596

9697
public function folderDelete(Request $request){
9798
$validatedData = $request->validate([
98-
'id' => 'numeric',
99+
'id' => 'required|numeric',
100+
'thisFolder' => 'required|numeric'
99101
]);
100102
$removeFolderService = new RemoveFolderService();
101103
$removeFolderService->folderDelete($request->input('id'), $request->input('thisFolder'));
@@ -104,8 +106,8 @@ public function folderDelete(Request $request){
104106

105107
public function fileAdd(Request $request){
106108
request()->validate([
107-
'file' => "required",
108-
'thisFolder' => 'numeric'
109+
'file' => "required",
110+
'thisFolder' => 'required|numeric'
109111
]);
110112
$mediaFolder = Folder::where('id', '=', $request->input('thisFolder'))->first();
111113
if($request->hasFile('file')){
@@ -121,8 +123,8 @@ public function fileAdd(Request $request){
121123

122124
public function file(Request $request){
123125
$validatedData = $request->validate([
124-
'id' => 'numeric',
125-
'thisFolder' => 'numeric'
126+
'id' => 'required|numeric',
127+
'thisFolder' => 'required|numeric'
126128
]);
127129
$mediaFolder = Folder::where('id', '=', $request->input('thisFolder'))->first();
128130
$media = $mediaFolder->getMedia()->where('id', $request->input('id'))->first();
@@ -140,8 +142,8 @@ public function file(Request $request){
140142

141143
public function fileDelete(Request $request){
142144
$validatedData = $request->validate([
143-
'id' => 'numeric',
144-
'thisFolder' => 'numeric'
145+
'id' => 'required|numeric',
146+
'thisFolder' => 'required|numeric'
145147
]);
146148
$mediaFolder = Folder::where('id', '=', $request->input('thisFolder'))->first();
147149
$media = $mediaFolder->getMedia()->where('id', $request->input('id'))->first();
@@ -151,9 +153,9 @@ public function fileDelete(Request $request){
151153

152154
public function fileUpdate(Request $request){
153155
$validatedData = $request->validate([
154-
'name' => 'required|min:1|max:256',
155-
'id' => 'numeric',
156-
'thisFolder' => 'numeric'
156+
'name' => 'required|min:1|max:256',
157+
'id' => 'required|numeric',
158+
'thisFolder' => 'required|numeric',
157159
]);
158160
$mediaFolder = Folder::where('id', '=', $request->input('thisFolder'))->first();
159161
$media = $mediaFolder->getMedia()->where('id', $request->input('id'))->first();
@@ -164,8 +166,9 @@ public function fileUpdate(Request $request){
164166

165167
public function fileMove(Request $request){
166168
$validatedData = $request->validate([
167-
'id' => 'numeric',
168-
'thisFolder' => 'numeric',
169+
'id' => 'required|numeric',
170+
'thisFolder' => 'required|numeric',
171+
'folder' => 'required'
169172
]);
170173
$oldFolder = Folder::where('id', '=', $request->input('thisFolder'))->first();
171174
$media = $oldFolder->getMedia()->where('id', $request->input('id'))->first();
@@ -182,8 +185,8 @@ public function fileMove(Request $request){
182185
public function cropp(Request $request){
183186
request()->validate([
184187
'file' => "required",
185-
'thisFolder' => 'numeric',
186-
'id' => 'numeric'
188+
'thisFolder' => 'required|numeric',
189+
'id' => 'required|numeric'
187190
]);
188191
$mediaFolder = Folder::where('id', '=', $request->input('thisFolder'))->first();
189192
$media = $mediaFolder->getMedia()->where('id', $request->input('id'))->first();
@@ -201,8 +204,8 @@ public function cropp(Request $request){
201204

202205
public function fileCopy(Request $request){
203206
$validatedData = $request->validate([
204-
'id' => 'numeric',
205-
'thisFolder' => 'numeric',
207+
'id' => 'required|numeric',
208+
'thisFolder' => 'required|numeric',
206209
]);
207210
$oldFolder = Folder::where('id', '=', $request->input('thisFolder'))->first();
208211
$media = $oldFolder->getMedia()->where('id', $request->input('id'))->first();

0 commit comments

Comments
 (0)