diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index fe7b1fcebc..1c7a48d888 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -892,7 +892,7 @@ class UsersController extends Controller $sort = e(Input::get('sort')); } - $users = User::select(array('users.id','users.employee_num','users.email','users.username','users.location_id','users.manager_id','users.first_name','users.last_name','users.created_at','users.notes','users.company_id', 'users.deleted_at','users.activated')) + $users = User::select(array('users.id','users.employee_num','users.jobtitle','users.email','users.username','users.location_id','users.manager_id','users.first_name','users.last_name','users.created_at','users.notes','users.company_id', 'users.deleted_at','users.activated')) ->with('assets', 'accessories', 'consumables', 'licenses', 'manager', 'groups', 'userloc', 'company','throttle'); $users = Company::scopeCompanyables($users); @@ -918,7 +918,7 @@ class UsersController extends Controller default: $allowed_columns = [ - 'last_name','first_name','email','username','employee_num', + 'last_name','first_name','email','jobtitle','username','employee_num', 'assets','accessories', 'consumables','licenses','groups','activated','created_at' ]; @@ -979,6 +979,7 @@ class UsersController extends Controller 'id' => $user->id, 'checkbox' => ($status!='deleted') ? '' : '', 'name' => ''.e($user->fullName()).'', + 'jobtitle' => e($user->jobtitle), 'email' => ($user->email!='') ? '' .'' diff --git a/app/Models/User.php b/app/Models/User.php index 2c78224dc5..5fcb8edc92 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -382,6 +382,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon ->orWhere('users.email', 'LIKE', "%$search%") ->orWhere('users.username', 'LIKE', "%$search%") ->orWhere('users.notes', 'LIKE', "%$search%") + ->orWhere('users.jobtitle', 'LIKE', "%$search%") ->orWhere('users.employee_num', 'LIKE', "%$search%") ->orWhere(function ($query) use ($search) { $query->whereHas('userloc', function ($query) use ($search) { diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 5ff870d405..72ac75129e 100755 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -82,6 +82,7 @@ {{ trans('admin/companies/table.title') }} {{ trans('admin/users/table.employee_num') }} {{ trans('admin/users/table.name') }} + {{ trans('admin/users/table.title') }}