mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 21:54:14 -08:00
unique undeleted recreated with laravel rule
This commit is contained in:
parent
e05af5216e
commit
d167ec6dc0
|
@ -35,12 +35,6 @@ class StoreAssetRequest extends ImageUploadRequest
|
|||
parent::rules(),
|
||||
);
|
||||
|
||||
// unsets unique check here, that check cannot run twice.
|
||||
$rules['asset_tags.*'] = $rules['asset_tag'];
|
||||
unset($rules['asset_tag']);
|
||||
$rules['serials.*'] = $rules['serial'];
|
||||
unset($rules['serial']);
|
||||
|
||||
return $rules;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -100,7 +100,10 @@ class Asset extends Depreciable
|
|||
'expected_checkin' => 'date|nullable',
|
||||
'location_id' => 'exists:locations,id|nullable',
|
||||
'rtd_location_id' => 'exists:locations,id|nullable',
|
||||
'asset_tag' => 'required|min:1|max:255|unique_undeleted',
|
||||
// okay, i know this looks scary - but it's not. it checks to see if the asset tag is unique, but only if the asset is not deleted - `NULL,NULL` says to ignore the unique rule if following conditions are met
|
||||
// https://laracasts.com/discuss/channels/laravel/unique-validation-with-soft-delete
|
||||
// this is tested and verified
|
||||
'asset_tag' => 'required|min:1|max:255|unique:assets,asset_tag,NULL,NULL,deleted_at,NULL',
|
||||
'purchase_date' => 'date|date_format:Y-m-d|nullable',
|
||||
'serial' => 'unique_serial|nullable',
|
||||
'purchase_cost' => 'numeric|nullable|gte:0',
|
||||
|
|
Loading…
Reference in a new issue