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

this works, need to write up pr

Browse source
This commit is contained in:
spencerrlongg 2023-11-01 11:33:29 -05:00
parent b67b00dd82
commit 53bd5626c9
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Exceptions/Handler.php
View file

@ -4,6 +4,7 @@ namespace App\Exceptions;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use App\Helpers\Helper; use App\Helpers\Helper;
use Illuminate\Http\JsonResponse;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;
use Illuminate\Auth\AuthenticationException; use Illuminate\Auth\AuthenticationException;
use ArieTimmerman\Laravel\SCIMServer\Exceptions\SCIMException; use ArieTimmerman\Laravel\SCIMServer\Exceptions\SCIMException;
@ -150,6 +151,11 @@ class Handler extends ExceptionHandler
return redirect()->guest('login'); return redirect()->guest('login');
} }
protected function invalidJson($request, ValidationException $exception)
{
return response()->json(Helper::formatStandardApiResponse('error', null, $exception->errors()), 200);
}
/** /**
* A list of the inputs that are never flashed for validation exceptions. * A list of the inputs that are never flashed for validation exceptions.

8
app/Http/Requests/StoreAssetRequest.php
View file

@ -15,8 +15,8 @@ class StoreAssetRequest extends ImageUploadRequest
*/ */
public function authorize(): bool public function authorize(): bool
{ {
//TODO: make sure this works // TODO: make sure this works
//return Gate::allows('create', new Asset); return Gate::allows('create', new Asset);
} }
public function prepareForValidation(): void public function prepareForValidation(): void
@ -36,13 +36,11 @@ class StoreAssetRequest extends ImageUploadRequest
parent::rules(), parent::rules(),
); );
if(!$this->expectsJson()) { // unsets unique check here, that check cannot run twice.
//accepts an array for the gui form
$rules['asset_tags.*'] = $rules['asset_tag']; $rules['asset_tags.*'] = $rules['asset_tag'];
unset($rules['asset_tag']); unset($rules['asset_tag']);
$rules['serials.*'] = $rules['serial']; $rules['serials.*'] = $rules['serial'];
unset($rules['serial']); unset($rules['serial']);
}
return $rules; return $rules;
} }