diff --git a/app/config/version.php b/app/config/version.php index 96e7df146f..7f20327d20 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0.6-161', - 'hash_version' => 'v2.0.6-161-g2888103', + 'app_version' => 'v2.0.6-162', + 'hash_version' => 'v2.0.6-162-g79c5d3f', ); \ No newline at end of file diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index 02dc403792..3248ee095c 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -890,8 +890,8 @@ class UsersController extends AdminController { $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')) - ->with('assets','accessories','consumables','licenses','manager','sentryThrottle','groups','userloc','company'); + $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')) + ->with('assets','accessories','consumables','licenses','manager','sentryThrottle','groups','userloc','company'); $users = Company::scopeCompanyables($users); switch ($status) {