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

not all working, but pushing to work on something else

Browse source
This commit is contained in:
spencerrlongg 2024-03-05 11:02:55 -06:00
parent c025e25839
commit eac01868ca
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/Api/AssetsController.php
View file

@ -622,10 +622,9 @@ class AssetsController extends Controller
* @since [v4.0] * @since [v4.0]
* @return \Illuminate\Http\JsonResponse * @return \Illuminate\Http\JsonResponse
*/ */
public function update(UpdateAssetRequest $request, Asset $id) public function update(UpdateAssetRequest $request, Asset $asset)
{ {
if ($asset = Asset::find($id)) { $asset->update($request->validated());
$asset->fill($request->validated());
// TODO: how much of this should go to validator? // TODO: how much of this should go to validator?
($request->filled('model_id')) ? ($request->filled('model_id')) ?
@ -689,11 +688,8 @@ class AssetsController extends Controller
} }
return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200); return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
}
// TODO: can this be moved up to ModelNotFound exception handler? would remove a couple lines here if we could use laravel's awesome route-model binding. // TODO: confirm that everything expects a _200_ model not found exception
// (would also need to confirm that then _everything_ expects a 200 when a model isn't found)
return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
} }

5
app/Http/Requests/UpdateAssetRequest.php
View file

@ -3,7 +3,6 @@
namespace App\Http\Requests; namespace App\Http\Requests;
use App\Models\Asset; use App\Models\Asset;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Gate;
class UpdateAssetRequest extends ImageUploadRequest class UpdateAssetRequest extends ImageUploadRequest
@ -20,6 +19,10 @@ class UpdateAssetRequest extends ImageUploadRequest
public function prepareForValidation() public function prepareForValidation()
{ {
dump($this->asset);
$asset = $this->route('asset');
dump($asset);
dump($this->route()->getName());
// the following are 'required' attributes that may or may not be present on an patch request // the following are 'required' attributes that may or may not be present on an patch request
// so supplying them here instead of doing funky array modification to the rules // so supplying them here instead of doing funky array modification to the rules
if (!$this->has('asset_tag')) { if (!$this->has('asset_tag')) {