Fixes #832 - show activated status in user listing

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') ? '<i class="fa fa-check"></i>' : '<i class="fa fa-times"></i>',
                 'actions'       => ($actions) ? $actions : '',
                 'companyName'   => is_null($user->company) ? '' : e($user->company->name)
             );