Skip to content

Commit 194c0b6

Browse files
committed
Implemented new alpha_space validation
1 parent b3b67ab commit 194c0b6

File tree

11 files changed

+14
-14
lines changed

11 files changed

+14
-14
lines changed

app/controllers/admin/AssetsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public function postEdit($assetId = null)
192192
'name' => 'required|min:3',
193193
'asset_tag' => 'required|alpha_dash|min:3',
194194
'model_id' => 'required',
195-
'serial' => 'required|alpha_dash|min:3',
195+
'serial' => 'required|alpha_space|min:3',
196196
'warranty_months' => 'required|integer',
197197
);
198198

app/controllers/admin/GroupsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public function postEdit($id = null)
162162

163163
// Declare the rules for the form validation
164164
$rules = array(
165-
'name' => 'required|alpha_dash|min:2',
165+
'name' => 'required|alpha_space|min:2',
166166
);
167167

168168
// Create a new validator instance from our validation rules

app/controllers/admin/UsersController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class UsersController extends AdminController {
2727
* @var array
2828
*/
2929
protected $validationRules = array(
30-
'first_name' => 'required|alpha_dash|min:3',
31-
'last_name' => 'required|alpha_dash|min:3',
30+
'first_name' => 'required|alpha_space|min:3',
31+
'last_name' => 'required|alpha_space|min:3',
3232
'email' => 'required|email|unique:users,email',
3333
'password' => 'required|between:3,32',
3434
'password_confirm' => 'required|between:3,32|same:password',

app/models/Asset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class Asset extends Elegant {
66
protected $softDelete = true;
77
protected $rules = array(
88
'name' => 'required|alpha_space|min:3',
9-
'asset_tag' => 'required|min:3|unique:assets',
9+
'asset_tag' => 'required|alpha_space|min:3|unique:assets',
1010
'model_id' => 'required',
1111
'serial' => 'required|alpha_dash|min:3',
1212
'warranty_months' => 'integer|min:1',

app/models/Category.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Category extends Elegant {
88
* Category validation rules
99
*/
1010
protected $rules = array(
11-
'name' => 'required|min:2',
11+
'name' => 'required|alpha_space|min:2',
1212
);
1313

1414

app/models/Depreciation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class Depreciation extends Elegant {
44

55
// Declare the rules for the form validation
66
protected $rules = array(
7-
'name' => 'required|min:3',
7+
'name' => 'required|alpha_space|min:3',
88
'months' => 'required|min:1|integer',
99
);
1010

app/models/License.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class License extends Elegant {
1212
protected $table = 'licenses';
1313
protected $softDelete = true;
1414
protected $rules = array(
15-
'name' => 'required|min:3',
16-
'serial' => 'required|min:5',
15+
'name' => 'required|alpha_space|min:3',
16+
'serial' => 'required|alpha_dash|min:5',
1717
'seats' => 'required|min:1|integer',
1818
'license_email' => 'email',
1919
);

app/models/Location.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ class Location extends Elegant {
66
protected $softDelete = true;
77
protected $table = 'locations';
88
protected $rules = array(
9-
'name' => 'required|min:3',
10-
'city' => 'required|min:3',
9+
'name' => 'required|alpha_space|min:3',
10+
'city' => 'required|alpha_space|min:3',
1111
'state' => 'required|alpha|min:2|max:2',
1212
'country' => 'required|alpha|min:2|max:2',
1313
'zip' => 'alpha_dash|min:5',

app/models/Manufacturer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class Manufacturer extends Elegant {
44
protected $softDelete = true;
55
// Declare the rules for the form validation
66
protected $rules = array(
7-
'name' => 'required|min:2',
7+
'name' => 'required|alpha_space|min:2',
88
);
99

1010
public function has_models()

app/models/Model.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class Model extends Elegant {
44

55
// Declare the rules for the form validation
66
protected $rules = array(
7-
'name' => 'required|not_in:foo,bar|min:3',
7+
'name' => 'required|alpha_space|min:3',
88
'modelno' => 'alpha_dash|min:1',
99
'category_id' => 'required|integer',
1010
);

0 commit comments

Comments
 (0)