From 8b77be9da39b133c20553ce357c92686027e972f Mon Sep 17 00:00:00 2001 From: madd15 Date: Thu, 16 Jul 2015 10:04:20 +0930 Subject: [PATCH 1/7] Update for change to username on sign in --- app/lang/en/auth/message.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lang/en/auth/message.php b/app/lang/en/auth/message.php index 8148b126e9..31bafb55ce 100755 --- a/app/lang/en/auth/message.php +++ b/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.', From 0f489b34b52f5e0a003a1322847201a64b07f597 Mon Sep 17 00:00:00 2001 From: madd15 Date: Thu, 16 Jul 2015 10:22:19 +0930 Subject: [PATCH 2/7] Change user list to include email address --- app/controllers/admin/AccessoriesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/AccessoriesController.php b/app/controllers/admin/AccessoriesController.php index 8dd6693e8e..bd2df7ab85 100755 --- a/app/controllers/admin/AccessoriesController.php +++ b/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); From 2659521dc994b70c5e26f98343e2b70a6a991636 Mon Sep 17 00:00:00 2001 From: madd15 Date: Thu, 16 Jul 2015 10:22:57 +0930 Subject: [PATCH 3/7] Change user list to include email address --- app/controllers/admin/AssetsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 2b5f6e5f5f..eda61131d4 100755 --- a/app/controllers/admin/AssetsController.php +++ b/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); From 0fbccef75956e6e56d7029abf8c3fadd2ad0f423 Mon Sep 17 00:00:00 2001 From: madd15 Date: Thu, 16 Jul 2015 10:23:28 +0930 Subject: [PATCH 4/7] Change user list to include email address --- app/controllers/admin/ConsumablesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/ConsumablesController.php b/app/controllers/admin/ConsumablesController.php index 61569cd41a..06a815bd65 100644 --- a/app/controllers/admin/ConsumablesController.php +++ b/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); From 31362f3e076332ec47a79dd9d03c5a6d2e4096e0 Mon Sep 17 00:00:00 2001 From: madd15 Date: Thu, 16 Jul 2015 10:23:54 +0930 Subject: [PATCH 5/7] Change user list to include email address --- app/controllers/admin/LicensesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php index a49e7f0393..40b09ba1b9 100755 --- a/app/controllers/admin/LicensesController.php +++ b/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 From 1fcd36e4acfde898fe53b82d6ff07a50ac10c6f4 Mon Sep 17 00:00:00 2001 From: madd15 Date: Thu, 16 Jul 2015 10:25:13 +0930 Subject: [PATCH 6/7] Change user list to include email address --- app/controllers/admin/UsersController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index 198207b012..0d106e6882 100755 --- a/app/controllers/admin/UsersController.php +++ b/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') From ba94a57e08ba1089250ba3c5fde3fe680e1f1a35 Mon Sep 17 00:00:00 2001 From: madd15 Date: Thu, 16 Jul 2015 10:26:53 +0930 Subject: [PATCH 7/7] Adjust Manager and Location width --- app/views/backend/users/edit.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/backend/users/edit.blade.php b/app/views/backend/users/edit.blade.php index e764d67770..e08893becf 100755 --- a/app/views/backend/users/edit.blade.php +++ b/app/views/backend/users/edit.blade.php @@ -150,7 +150,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', '
:message') }}
@@ -160,7 +160,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', '
:message') }}