Merge branch '2.0' of github.com:snipe/snipe-it into 2.0

app/controllers/admin/AccessoriesController.php

@@ -218,7 +218,7 @@ class AccessoriesController extends AdminController
         }
 
         // Get the dropdown of users and then pass it to the checkout view
-        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name," (",email,")") as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
 
         return View::make('backend/accessories/checkout', compact('accessory'))->with('users_list',$users_list);
 

app/controllers/admin/AssetsController.php

@@ -376,7 +376,7 @@ class AssetsController extends AdminController
         }
 
         // Get the dropdown of users and then pass it to the checkout view
-        $users_list = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+        $users_list = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name," (",email,")") as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
 
         return View::make('backend/hardware/checkout', compact('asset'))->with('users_list',$users_list);
 

app/controllers/admin/ConsumablesController.php

@@ -218,7 +218,7 @@ class ConsumablesController extends AdminController
         }
 
         // Get the dropdown of users and then pass it to the checkout view
-        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name," (",email,")") as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
 
         return View::make('backend/consumables/checkout', compact('consumable'))->with('users_list',$users_list);
 

app/controllers/admin/LicensesController.php

@@ -408,7 +408,7 @@ class LicensesController extends AdminController
         }
 
         // Get the dropdown of users and then pass it to the checkout view
-         $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+         $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name," (",email,")") as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
 
 
         // Left join to get a list of assets and some other helpful info

app/controllers/admin/UsersController.php

@@ -78,7 +78,7 @@ class UsersController extends AdminController
 
         $location_list = array('' => '') + Location::lists('name', 'id');
         $manager_list = array('' => '') + DB::table('users')
-            ->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))
+            ->select(DB::raw('concat(last_name,", ",first_name," (",email,")") as full_name, id'))
             ->whereNull('deleted_at','and')
             ->orderBy('last_name', 'asc')
             ->orderBy('first_name', 'asc')
@@ -213,7 +213,7 @@ class UsersController extends AdminController
 
             $location_list = array('' => '') + Location::lists('name', 'id');
             $manager_list = array('' => 'Select a User') + DB::table('users')
-            ->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))
+            ->select(DB::raw('concat(last_name,", ",first_name," (",email,")") as full_name, id'))
             ->whereNull('deleted_at')
             ->where('id','!=',$id)
             ->orderBy('last_name', 'asc')
@@ -559,7 +559,7 @@ class UsersController extends AdminController
 
             $location_list = array('' => '') + Location::lists('name', 'id');
             $manager_list = array('' => 'Select a User') + DB::table('users')
-            ->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))
+            ->select(DB::raw('concat(last_name,", ",first_name," (",email,")") as full_name, id'))
             ->whereNull('deleted_at')
             ->where('id','!=',$id)
             ->orderBy('last_name', 'asc')

app/lang/en/auth/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'account_already_exists' => 'An account with the this email already exists.',
-    'account_not_found'      => 'The email account or password is incorrect.',
+    'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
     'account_banned'         => 'This user account is banned.',

app/views/backend/users/edit.blade.php

@@ -150,7 +150,7 @@
             <div class="form-group {{ $errors->has('manager_id') ? 'has-error' : '' }}">
                 <label class="col-md-3 control-label" for="manager_id">@lang('admin/users/table.manager')</label>
                 <div class="col-md-7">
-                    {{ Form::select('manager_id', $manager_list , Input::old('manager_id', $user->manager_id), array('class'=>'select2', 'style'=>'width:250px')) }}
+                    {{ Form::select('manager_id', $manager_list , Input::old('manager_id', $user->manager_id), array('class'=>'select2', 'style'=>'width:350px')) }}
                     {{ $errors->first('manager_id', '<br><span class="alert-msg">:message</span>') }}
                 </div>
             </div>
@@ -160,7 +160,7 @@
                 <label class="col-md-3 control-label" for="location_id">@lang('admin/users/table.location')
                     </label>
                 <div class="col-md-7">
-                    {{ Form::select('location_id', $location_list , Input::old('location_id', $user->location_id), array('class'=>'select2', 'style'=>'width:250px')) }}
+                    {{ Form::select('location_id', $location_list , Input::old('location_id', $user->location_id), array('class'=>'select2', 'style'=>'width:350px')) }}
                     {{ $errors->first('location_id', '<br><span class="alert-msg">:message</span>') }}
                 </div>
             </div>