DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Nicer handler for JSON model not found errors

Browse source
This commit is contained in:
snipe 2017-01-12 19:06:39 -08:00
parent d9d048f90d
commit 3c6010679a
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/Exceptions/Handler.php
View file

@ -5,6 +5,7 @@ namespace App\Exceptions;
use Exception; use Exception;
use Illuminate\Auth\AuthenticationException; use Illuminate\Auth\AuthenticationException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use App\Helpers\Helper;
class Handler extends ExceptionHandler class Handler extends ExceptionHandler
{ {
@ -44,17 +45,36 @@ class Handler extends ExceptionHandler
*/ */
public function render($request, Exception $e) public function render($request, Exception $e)
{ {
// CSRF token mismatch error
if ($e instanceof \Illuminate\Session\TokenMismatchException) { if ($e instanceof \Illuminate\Session\TokenMismatchException) {
return redirect()->back()->with('error', trans('general.token_expired')); return redirect()->back()->with('error', trans('general.token_expired'));
} }
// 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)) { if ($this->isHttpException($e)) {
$statusCode = $e->getStatusCode(); $statusCode = $e->getStatusCode();
switch ($statusCode) { switch ($statusCode) {
case '404': case '404':
if ($request->ajax() || $request->wantsJson())
{
return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode . ' not found'), 404);
}
return response()->view('layouts/basic', [ return response()->view('layouts/basic', [
'content' => view('errors/404') 'content' => view('errors/404')
]); ]);