DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Let whatever the other error is fall through

Browse source
This commit is contained in:
snipe 2017-01-12 19:38:40 -08:00
parent 3c6010679a
commit ed325d2fe5
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/Exceptions/Handler.php
View file

@ -55,26 +55,37 @@ class Handler extends ExceptionHandler
// Handle Ajax requests that fail because the model doesn't exist
if ($request->ajax() || $request->wantsJson()) {
if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
$className = last(explode('\\', $e->getModel()));
return response()->json(Helper::formatStandardApiResponse('error', null, $className . ' not found'), 200);
}
if ($this->isHttpException($e)) {
switch ($e->getStatusCode()) {
case '404':
return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode . ' not found'), 404);
break;
case '405':
return response()->json(Helper::formatStandardApiResponse('error', null, 'Method not allowed'), 405);
break;
default:
return response()->json(Helper::formatStandardApiResponse('error', null, $e->getStatusCode()), 405);
}
}
}
if ($this->isHttpException($e)) {
$statusCode = $e->getStatusCode();
switch ($statusCode) {
case '404':
if ($request->ajax() || $request->wantsJson())
{
return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode . ' not found'), 404);
}
return response()->view('layouts/basic', [
'content' => view('errors/404')
]);
@ -95,7 +106,7 @@ class Handler extends ExceptionHandler
protected function unauthenticated($request, AuthenticationException $exception)
{
if ($request->expectsJson()) {
return response()->json(['error' => 'Unauthenticated.'], 401);
return response()->json(['error' => 'Unauthorized.'], 401);
}
return redirect()->guest('login');