Merge branch 'refs/heads/develop'

snipe · Nov 29, 2013 · ddabdac · ddabdac
2 parents 0382183 + 839d01a
commit ddabdac
Show file tree

Hide file tree

Showing 35 changed files with 194 additions and 184 deletions.
diff --git a/app/controllers/AuthController.php b/app/controllers/AuthController.php
@@ -338,7 +338,7 @@ public function getLogout()
 		Sentry::logout();
 
 		// Redirect to the users page
-		return Redirect::route('assets')->with('success', 'You have successfully logged out!');
+		return Redirect::route('home')->with('success', 'You have successfully logged out!');
 	}
 
 }
diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php
@@ -344,6 +344,7 @@ public function postCheckin($seatId)
 		// Declare the rules for the form validation
 		$rules = array(
 			'note'   => 'alpha_space',
+			'notes'   => 'alpha_space',
 		);
 
 		// Create a new validator instance from our validation rules

diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
@@ -27,11 +27,11 @@ class UsersController extends AdminController {
 	 * @var array
 	 */
 	protected $validationRules = array(
-		'first_name'       => 'required|alpha_space|min:3',
-		'last_name'        => 'required|alpha_space|min:3',
+		'first_name'       => 'required|alpha_space|min:2',
+		'last_name'        => 'required|alpha_space|min:2',
 		'email'            => 'required|email|unique:users,email',
-		'password'         => 'required|between:3,32',
-		'password_confirm' => 'required|between:3,32|same:password',
+		'password'         => 'required|between:10,32',
+		'password_confirm' => 'required|between:10,32|same:password',
 	);
 
 	/**

diff --git a/app/models/Asset.php b/app/models/Asset.php
@@ -58,7 +58,7 @@ public function assigneduser()
 	**/
   	public function assetloc()
   	{
-  		return $this->assigneduser->hasOne('Location');
+  		return $this->assigneduser->userloc();
   	}
 
   	/**

diff --git a/app/models/License.php b/app/models/License.php
@@ -17,6 +17,7 @@ class License extends Elegant {
 			'seats'   => 'required|min:1|integer',
 			'license_email'   => 'email',
 			'note'   => 'alpha_space',
+			'notes'   => 'alpha_space',
 		);
 
 	public function assignedusers()
@@ -25,13 +26,6 @@ public function assignedusers()
 
   	}
 
-	/**
-	* Get the asset's location based on the assigned user
-	**/
-  	public function assetloc()
-  	{
-  		return $this->assignedusers->hasOne('Location');
-  	}
 
   	/**
 	* Get asset logs for this asset

diff --git a/app/models/User.php b/app/models/User.php
@@ -44,7 +44,7 @@ public function assets()
 
 	public function licenses()
 	{
-		return $this->belongsToMany('License', 'license_seats', 'assigned_to', 'license_id')->withTrashed();
+		return $this->belongsToMany('License', 'license_seats', 'assigned_to', 'license_id')->withTrashed()->withPivot('id');
 	}
 
 
@@ -62,7 +62,7 @@ public function userlog()
 	**/
   	public function userloc()
   	{
-  		return $this->hasOne('Location','id')->withTrashed();
+  		return $this->belongsTo('Location','location_id')->withTrashed();
   	}
 
 }
diff --git a/app/routes.php b/app/routes.php
@@ -18,6 +18,7 @@
 {
 
 	Route::get('/', array('as' => '', 'uses' => 'Controllers\Admin\AssetsController@getIndex'));
+	Route::get('/', array('as' => 'hardware', 'uses' => 'Controllers\Admin\AssetsController@getIndex'));
 	Route::get('create', array('as' => 'create/hardware', 'uses' => 'Controllers\Admin\AssetsController@getCreate'));
 	Route::post('create', 'Controllers\Admin\AssetsController@postCreate');
 	Route::get('{assetId}/edit', array('as' => 'update/hardware', 'uses' => 'Controllers\Admin\AssetsController@getEdit'));

diff --git a/app/validators.php b/app/validators.php
@@ -2,5 +2,5 @@
 
 Validator::extend('alpha_space', function($attribute,$value,$parameters)
 {
-	return preg_match("/^[-+:?()_,!. a-zA-Z0-9]+$/",$value);
+	return preg_match("/^[-+:?'()_,!. a-zA-Z0-9]+$/",$value);
 });
diff --git a/app/views/backend/hardware/checkin.blade.php b/app/views/backend/hardware/checkin.blade.php
@@ -13,13 +13,10 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>
-	Checkin Asset
-
 		<div class="pull-right">
 			<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
-	</h3>
+		<h3> Checkin Asset </h3>
 </div>
 
 <form class="form-horizontal" method="post" action="" autocomplete="off">

diff --git a/app/views/backend/hardware/checkout.blade.php b/app/views/backend/hardware/checkout.blade.php
@@ -13,16 +13,17 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
+
+	<div class="pull-right">
+		<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+	</div>
+
 	<h3>
 	@if ($asset->id)
-	Checkout Asset to User
+		Checkout Asset to User
 	@else
-	Create Asset
+		Create Asset
 	@endif
-
-		<div class="pull-right">
-			<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
 	</h3>
 </div>
 

diff --git a/app/views/backend/hardware/clone.blade.php b/app/views/backend/hardware/clone.blade.php
@@ -9,13 +9,12 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>
-	Clone Asset
 
 		<div class="pull-right">
 			<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		</div>
-	</h3>
+
+		<h3>Clone Asset</h3>
 </div>
 
 

diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php
@@ -13,21 +13,23 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
+
+	<div class="pull-right">
+		@if ($asset->id)
+			<a href="{{ route('view/hardware',$asset->id) }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		@else
+			<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		@endif
+	</div>
+
 	<h3>
 	@if ($asset->id)
-	Asset Update
+		Asset Update
 	@else
-	Create Asset
+		Create Asset
 	@endif
 
-		<div class="pull-right">
-			@if ($asset->id)
-			<a href="{{ route('view/hardware',$asset->id) }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-			@else
-			<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-			@endif
 
-		</div>
 	</h3>
 </div>
 

diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
@@ -23,7 +23,11 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>
+		<div class="pull-right">
+			<a href="{{ route('create/hardware') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
+		</div>
+
+		<h3>
 		@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD')  || Input::get('Deployed'))
 			@if (Input::get('Pending'))
 				Pending
@@ -37,14 +41,8 @@
 		@else
 			All
 		@endif
-
 				Assets
-
-		<div class="pull-right">
-			<a href="{{ route('create/hardware') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
-
-		</div>
-	</h3>
+		</h3>
 
 </div>
 

diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php
@@ -10,26 +10,29 @@
 @section('content')
 <div id="pad-wrapper" class="user-profile">
                 <!-- header -->
+
+				<div class="btn-group pull-right">
+					<button class="btn glow">Actions</button>
+					<button class="btn glow dropdown-toggle" data-toggle="dropdown">
+						<span class="caret"></span>
+					</button>
+					<ul class="dropdown-menu">
+
+						@if ($asset->status_id == 1)
+							@if ($asset->assigned_to != 0)
+								<li><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat info">Checkin</a></li>
+							@endif
+						@elseif ($asset->status_id == 0)
+								<li><a href="{{ route('checkout/hardware', $asset->id) }}" class="btn-flat success">Checkout</a></li>
+						@endif
+						<li><a href="{{ route('update/hardware', $asset->id) }}">Edit Asset</a></li>
+						<li><a href="{{ route('clone/hardware', $asset->id) }}">Clone Asset</a></li>
+					</ul>
+				</div>
+
 				<h3 class="name">History for {{ $asset->asset_tag }} ({{ $asset->name }})
 
-							<div class="btn-group pull-right">
-                                <button class="btn glow">Actions</button>
-                                <button class="btn glow dropdown-toggle" data-toggle="dropdown">
-                                    <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
 
-									@if ($asset->status_id == 1)
-										@if ($asset->assigned_to != 0)
-											<li><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat info">Checkin</a></li>
-										@endif
-									@elseif ($asset->status_id == 0)
-											<li><a href="{{ route('checkout/hardware', $asset->id) }}" class="btn-flat success">Checkout</a></li>
-									@endif
-                                   	<li><a href="{{ route('update/hardware', $asset->id) }}">Edit Asset</a></li>
-                                    <li><a href="{{ route('clone/hardware', $asset->id) }}">Clone Asset</a></li>
-                                </ul>
-                            </div>
 				</h3>
                 <div class="row-fluid profile">
                     <!-- bio, new note & orders column -->

diff --git a/app/views/backend/licenses/checkin.blade.php b/app/views/backend/licenses/checkin.blade.php
@@ -9,12 +9,12 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>Checkin License</h3>
 
-		<div class="pull-right">
-			<a href="{{ route('assets') }}"  class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
-	</h3>
+	<div class="pull-right">
+		<a href="{{ route('licenses') }}"  class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+	</div>
+
+	<h3>Checkin License</h3>
 </div>
 
 

diff --git a/app/views/backend/licenses/checkout.blade.php b/app/views/backend/licenses/checkout.blade.php
@@ -9,12 +9,13 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
+
+	<div class="pull-right">
+		<a href="{{ route('licenses') }}"  class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+	</div>
+
 	<h3>Checkout License to User</h3>
 
-		<div class="pull-right">
-			<a href="{{ route('assets') }}"  class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
-	</h3>
 </div>
 
 <form class="form-horizontal" method="post" action="" autocomplete="off">

diff --git a/app/views/backend/licenses/edit.blade.php b/app/views/backend/licenses/edit.blade.php
@@ -13,20 +13,23 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
+
+	<div class="pull-right">
+		@if ($license->id)
+			<a href="{{ route('view/license',$license->id) }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		@else
+			<a href="{{ route('licenses') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		@endif
+	</div>
+
 	<h3>
 		@if ($license->id)
 		Update License
 		@else
 		Create License
 		@endif
 
-		<div class="pull-right">
-			@if ($license->id)
-			<a href="{{ route('view/license',$license->id) }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-			@else
-			<a href="{{ route('licenses') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-			@endif
-		</div>
+
 	</h3>
 </div>
 

diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php
@@ -8,13 +8,11 @@
 {{-- Page content --}}
 @section('content')
 <div class="page-header">
-	<h3>
-		Software Licenses
+	<div class="pull-right">
+		<a href="{{ route('create/licenses') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
+	</div>
 
-		<div class="pull-right">
-			<a href="{{ route('create/licenses') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
-		</div>
-	</h3>
+	<h3>Software Licenses</h3>
 </div>
 
 <table id="example">