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 1 Packages Projects Releases Wiki Activity

Make validation match database fields

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2023-05-08 14:12:54 -07:00
parent 6486ea4fb7
commit f1d85c67f1
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Models/Location.php
View file

@ -26,11 +26,12 @@ class Location extends SnipeModel
protected $table = 'locations'; protected $table = 'locations';
protected $rules = [ protected $rules = [
'name' => 'required|min:2|max:255|unique_undeleted', 'name' => 'required|min:2|max:255|unique_undeleted',
'city' => 'min:2|max:255|nullable', 'address' => 'max:191|nullable',
'country' => 'min:2|max:255|nullable', 'address2' => 'max:191|nullable',
'address' => 'max:80|nullable', 'city' => 'max:191|nullable',
'address2' => 'max:80|nullable', 'state' => 'min:2|max:191|nullable',
'zip' => 'min:3|max:12|nullable', 'country' => 'min:2|max:191|nullable',
'zip' => 'max:10|nullable',
'manager_id' => 'exists:users,id|nullable', 'manager_id' => 'exists:users,id|nullable',
'parent_id' => 'non_circular:locations,id', 'parent_id' => 'non_circular:locations,id',
]; ];

12
app/Models/Supplier.php
View file

@ -16,17 +16,17 @@ class Supplier extends SnipeModel
protected $table = 'suppliers'; protected $table = 'suppliers';
protected $rules = [ protected $rules = [
'name' => 'required|min:1|max:255|unique_undeleted', 'name' => 'required|min:1|max:255|unique_undeleted',
'address' => 'max:250|nullable',
'address2' => 'max:250|nullable',
'city' => 'max:255|nullable',
'state' => 'max:32|nullable',
'country' => 'max:3|nullable',
'fax' => 'min:7|max:35|nullable', 'fax' => 'min:7|max:35|nullable',
'phone' => 'min:7|max:35|nullable', 'phone' => 'min:7|max:35|nullable',
'contact' => 'max:100|nullable', 'contact' => 'max:100|nullable',
'notes' => 'max:191|nullable', // Default string length is 191 characters.. 'notes' => 'max:191|nullable', // Default string length is 191 characters..
'email' => 'email|max:150|nullable', 'email' => 'email|max:150|nullable',
'address' => 'max:250|nullable',
'address2' => 'max:250|nullable',
'city' => 'max:191|nullable',
'state' => 'min:2|max:191|nullable',
'country' => 'min:2|max:191|nullable',
'zip' => 'max:10|nullable', 'zip' => 'max:10|nullable',
'url' => 'sometimes|nullable|string|max:250', 'url' => 'sometimes|nullable|string|max:250',
]; ];

5
app/Models/User.php
View file

@ -98,6 +98,11 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
'start_date' => 'nullable|date_format:Y-m-d', 'start_date' => 'nullable|date_format:Y-m-d',
'end_date' => 'nullable|date_format:Y-m-d|after_or_equal:start_date', 'end_date' => 'nullable|date_format:Y-m-d|after_or_equal:start_date',
'autoassign_licenses' => 'boolean', 'autoassign_licenses' => 'boolean',
'address' => 'max:191|nullable',
'city' => 'max:191|nullable',
'state' => 'min:2|max:191|nullable',
'country' => 'min:2|max:191|nullable',
'zip' => 'max:10|nullable',
]; ];
/** /**