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

lots of cleanup to do, but this DOES work

Browse source
This commit is contained in:
spencerrlongg 2024-03-13 15:57:10 -05:00
parent f01b205486
commit f6ab0f8f46
2 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ namespace App\Http\Requests;
use App\Models\Asset; use App\Models\Asset;
use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Gate;
use Illuminate\Validation\Rule;
class UpdateAssetRequest extends ImageUploadRequest class UpdateAssetRequest extends ImageUploadRequest
{ {
@ -35,10 +36,29 @@ class UpdateAssetRequest extends ImageUploadRequest
*/ */
public function rules() public function rules()
{ {
$rules = array_merge( $rules = [
(new Asset())->getRules(), 'model_id' => 'required|integer|exists:models,id,deleted_at,NULL|not_array',
parent::rules(), 'status_id' => 'required|integer|exists:status_labels,id',
); 'asset_tag' => ['required', 'min:1', 'max:255', 'not_array', Rule::unique('assets', 'asset_tag')->ignore($this->asset)->withoutTrashed()],
'name' => 'nullable|max:255',
'company_id' => 'nullable|integer|exists:companies,id',
'warranty_months' => 'nullable|numeric|digits_between:0,240',
'last_checkout' => 'nullable|date_format:Y-m-d H:i:s',
'expected_checkin' => 'nullable|date',
'location_id' => 'nullable|exists:locations,id',
'rtd_location_id' => 'nullable|exists:locations,id',
'purchase_date' => 'nullable|date|date_format:Y-m-d',
'serial' => 'nullable|unique_undeleted:assets,serial',
'purchase_cost' => 'nullable|numeric|gte:0',
'supplier_id' => 'nullable|exists:suppliers,id',
'asset_eol_date' => 'nullable|date',
'eol_explicit' => 'nullable|boolean',
'byod' => 'nullable|boolean',
'order_number' => 'nullable|string|max:191',
'notes' => 'nullable|string|max:65535',
'assigned_to' => 'nullable|integer',
'requestable' => 'nullable|boolean',
];
return $rules; return $rules;
} }

2
app/Models/Asset.php
View file

@ -92,7 +92,7 @@ class Asset extends Depreciable
protected $rules = [ protected $rules = [
'model_id' => 'required|integer|exists:models,id,deleted_at,NULL|not_array', 'model_id' => 'required|integer|exists:models,id,deleted_at,NULL|not_array',
'status_id' => 'required|integer|exists:status_labels,id', 'status_id' => 'required|integer|exists:status_labels,id',
'asset_tag' => 'required|min:1|max:255|not_array|unique:assets,asset_tag,asset,id,deleted_at,"NULL"', 'asset_tag' => 'required|min:1|max:255|unique_undeleted:assets,asset_tag|not_array',
'name' => 'nullable|max:255', 'name' => 'nullable|max:255',
'company_id' => 'nullable|integer|exists:companies,id', 'company_id' => 'nullable|integer|exists:companies,id',
'warranty_months' => 'nullable|numeric|digits_between:0,240', 'warranty_months' => 'nullable|numeric|digits_between:0,240',