DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2021-01-27 12:49:33 -08:00
parent a050aba72f 6e83679528
commit 9f43d3345f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/Users/UserFilesController.php
View file

@ -38,7 +38,7 @@ class UserFilesController extends Controller
$filename = 'user-' . $user->id . '-' . str_random(8); $filename = 'user-' . $user->id . '-' . str_random(8);
$filename .= '-' . str_slug($file->getClientOriginalName()) . '.' . $extension; $filename .= '-' . str_slug($file->getClientOriginalName()) . '.' . $extension;
if (!$file->move($destinationPath, $filename)) { if (!$file->move($destinationPath, $filename)) {
return JsonResponse::create(["error" => "Unabled to move file"], 500); return redirect()->back()->with('error', trans('admin/users/message.upload.invalidfiles'));
} }
//Log the uploaded file to the log //Log the uploaded file to the log
$logAction = new Actionlog(); $logAction = new Actionlog();
@ -57,10 +57,10 @@ class UserFilesController extends Controller
} }
$logActions[] = $logAction; $logActions[] = $logAction;
} }
// dd($logActions); // dd($logActions);
return JsonResponse::create($logActions); return redirect()->back()->with('success', trans('admin/users/message.upload.success'));
} }
return JsonResponse::create(["error" => "No User associated with this request"], 500); return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));
} }