Merge branch 'refs/heads/develop'

Author: snipe

app/controllers/admin/AssetsController.php

@@ -189,11 +189,11 @@ public function postEdit($assetId = null)
 
 		// Declare the rules for the form validation
 		$rules = array(
-		'name'   => 'required|alpha_dash|min:3',
+		'name'   => 'required|min:3',
 		'asset_tag'   => 'required|alpha_dash|min:3',
 		'model_id'   => 'required',
-		'serial'   => 'required|alpha_dash|min:3',
-		'warranty_months'   => 'integer|min:1',
+		'serial'   => 'required|alpha_space|min:3',
+		'warranty_months'   => 'required|integer',
     	);
 
 		// Create a new validator instance from our validation rules

app/controllers/admin/GroupsController.php

@@ -162,7 +162,7 @@ public function postEdit($id = null)
 
 		// Declare the rules for the form validation
 		$rules = array(
-			'name' => 'required|alpha_dash|min:2',
+			'name' => 'required|alpha_space|min:2',
 		);
 
 		// Create a new validator instance from our validation rules

app/controllers/admin/UsersController.php

@@ -27,8 +27,8 @@ class UsersController extends AdminController {
 	 * @var array
 	 */
 	protected $validationRules = array(
-		'first_name'       => 'required|alpha_dash|min:3',
-		'last_name'        => 'required|alpha_dash|min:3',
+		'first_name'       => 'required|alpha_space|min:3',
+		'last_name'        => 'required|alpha_space|min:3',
 		'email'            => 'required|email|unique:users,email',
 		'password'         => 'required|between:3,32',
 		'password_confirm' => 'required|between:3,32|same:password',

app/lang/en/validation.php

@@ -64,6 +64,7 @@
 	"unique"           => "The :attribute has already been taken.",
 	"url"              => "The :attribute format is invalid.",
 
+
 	/*
 	|--------------------------------------------------------------------------
 	| Custom Validation Language Lines
@@ -76,6 +77,7 @@
 	*/
 
 	'custom' => array(),
+	'alpha_space' => "The :attribute field may only contain letters, commas, spaces and dashes.",
 
 	/*
 	|--------------------------------------------------------------------------

app/models/Asset.php

@@ -5,8 +5,8 @@ class Asset extends Elegant {
 	protected $table = 'assets';
 	protected $softDelete = true;
 	protected $rules = array(
-		'name'   => 'required|min:3',
-		'asset_tag'   => 'required|min:3|unique:assets',
+		'name'   => 'required|alpha_space|min:3',
+		'asset_tag'   => 'required|alpha_space|min:3|unique:assets',
 		'model_id'   => 'required',
 		'serial'   => 'required|alpha_dash|min:3',
 		'warranty_months'   => 'integer|min:1',

app/models/Category.php

@@ -8,7 +8,7 @@ class Category extends Elegant {
 	* Category validation rules
 	*/
 	protected $rules = array(
-		'name'   => 'required|min:2',
+		'name'   => 'required|alpha_space|min:2',
     );
 
 

app/models/Depreciation.php

@@ -4,7 +4,7 @@ class Depreciation extends Elegant {
 
 		// Declare the rules for the form validation
 		protected $rules = array(
-			'name'   => 'required|min:3',
+			'name'   => 'required|alpha_space|min:3',
 			'months'   => 'required|min:1|integer',
 		);
 

app/models/License.php

@@ -12,8 +12,8 @@ class License extends Elegant {
 	protected $table = 'licenses';
 	protected $softDelete = true;
 	protected $rules = array(
-			'name'   => 'required|min:3',
-			'serial'   => 'required|min:5',
+			'name'   => 'required|alpha_space|min:3',
+			'serial'   => 'required|alpha_dash|min:5',
 			'seats'   => 'required|min:1|integer',
 			'license_email'   => 'email',
 		);

app/models/Location.php

@@ -6,8 +6,8 @@ class Location extends Elegant {
 	protected $softDelete = true;
 	protected $table = 'locations';
 	protected $rules = array(
-			'name'  		=> 'required|min:3',
-			'city'   		=> 'required|min:3',
+			'name'  		=> 'required|alpha_space|min:3',
+			'city'   		=> 'required|alpha_space|min:3',
 			'state'   		=> 'required|alpha|min:2|max:2',
 			'country'   	=> 'required|alpha|min:2|max:2',
 			'zip'   => 'alpha_dash|min:5',

app/models/Manufacturer.php

@@ -4,7 +4,7 @@ class Manufacturer extends Elegant {
 	protected $softDelete = true;
 	// Declare the rules for the form validation
 	protected $rules = array(
-		'name'   => 'required|min:2',
+		'name'   => 'required|alpha_space|min:2',
 	);
 
 	public function has_models()