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

Merge remote-tracking branch 'origin/v3' into v3-master

Browse source
This commit is contained in:
snipe 2016-06-22 12:52:00 -07:00
parent 5daaa24a07 f753783ca0
commit 424b854e29
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/AssetModel.php
View file

@ -19,7 +19,7 @@ class AssetModel extends Model
// Declare the rules for the model validation // Declare the rules for the model validation
protected $rules = array( protected $rules = array(
'name' => 'required|min:2|max:255', 'name' => 'required|min:1|max:255',
'modelno' => 'min:1|max:255', 'modelno' => 'min:1|max:255',
'category_id' => 'required|integer', 'category_id' => 'required|integer',
'manufacturer_id' => 'required|integer', 'manufacturer_id' => 'required|integer',

2
app/Models/Category.php
View file

@ -25,7 +25,7 @@ class Category extends Model
*/ */
public $rules = array( public $rules = array(
'user_id' => 'numeric', 'user_id' => 'numeric',
'name' => 'required|min:3|max:255|unique:categories,name,NULL,deleted_at', 'name' => 'required|min:1|max:255|unique:categories,name,NULL,deleted_at',
'category_type' => 'required', 'category_type' => 'required',
); );