diff --git a/app/config/version.php b/app/config/version.php index 9b91edb9a9..f7252126a5 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.1.0-7', - 'hash_version' => 'v2.1.0-7-ge70dab6', + 'app_version' => 'v2.1.0-8', + 'hash_version' => 'v2.1.0-8-g1b1a733', ); \ No newline at end of file diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index 2654eae4ed..2e23ee7623 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -907,7 +907,7 @@ 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', 'users.deleted_at')) + $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')) ->with('assets','accessories','consumables','licenses','manager','sentryThrottle','groups','userloc','company'); $users = Company::scopeCompanyables($users); @@ -935,7 +935,7 @@ class UsersController extends AdminController { $allowed_columns = [ 'last_name','first_name','email','username','employee_num', - 'assets','accessories', 'consumables','licenses','groups' + 'assets','accessories', 'consumables','licenses','groups','activated' ]; $sort = in_array($sort, $allowed_columns) ? $sort : 'first_name'; @@ -996,6 +996,7 @@ class UsersController extends AdminController { 'consumables' => $user->consumables->count(), 'groups' => $group_names, 'notes' => $user->notes, + 'activated' => ($user->activated=='1') ? '' : '', 'actions' => ($actions) ? $actions : '', 'companyName' => is_null($user->company) ? '' : e($user->company->name) ); diff --git a/app/lang/en/general.php b/app/lang/en/general.php index a4e0cc7c26..7979e0c890 100755 --- a/app/lang/en/general.php +++ b/app/lang/en/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'Address', 'admin' => 'Admin', + 'activated' => 'Activated', 'add_seats' => 'Added seats', 'all_assets' => 'All Assets', 'all' => 'All', diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php index c1fb0446f6..8bf3c08573 100755 --- a/app/views/backend/users/index.blade.php +++ b/app/views/backend/users/index.blade.php @@ -9,6 +9,12 @@ {{-- Page content --}} @section('content') + +
@if (Setting::getSettings()->ldap_enabled == 1) @@ -79,6 +85,7 @@ {{ Lang::get('general.groups') }} {{ Lang::get('general.notes') }} + {{ Lang::get('general.activated') }} {{ Lang::get('table.actions') }}