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

Small fix for Group Functional Tests

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2020-05-11 18:07:14 -07:00
parent 9ee28c7513
commit b9e821c0e6
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@ class AssetRequest extends Request
public function rules() public function rules()
{ {
$rules = [ $rules = [
'asset_tag' => 'required|min:1|max:255|unique_undeleted',
'name' => 'max:255|nullable', 'name' => 'max:255|nullable',
'model_id' => 'required|integer|exists:models,id', 'model_id' => 'required|integer|exists:models,id',
'status_id' => 'required|integer|exists:status_labels,id', 'status_id' => 'required|integer|exists:status_labels,id',
@ -45,9 +46,7 @@ class AssetRequest extends Request
]; ];
$settings = \App\Models\Setting::getSettings(); $settings = \App\Models\Setting::getSettings();
$rules['asset_tag'] = ($settings->auto_increment_assets == '1') ? 'max:255' : 'required';
if ($this->request->get('model_id') != '') { if ($this->request->get('model_id') != '') {
$model = AssetModel::find($this->request->get('model_id')); $model = AssetModel::find($this->request->get('model_id'));