Fixes #832 - show activated status in user listing

app/config/version.php

@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.1.0-7',
-  'hash_version' => 'v2.1.0-7-ge70dab6',
+  'app_version' => 'v2.1.0-8',
+  'hash_version' => 'v2.1.0-8-g1b1a733',
 );

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)
             );

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',

app/views/backend/users/index.blade.php

@@ -9,6 +9,12 @@
 {{-- Page content --}}
 @section('content')
 
+<style>
+.hidden-xs {
+  display: inline-block !important;
+}
+</style>
+
 <div class="row header">
     <div class="col-md-12">
         @if (Setting::getSettings()->ldap_enabled == 1)
@@ -79,6 +85,7 @@
                    </th>
                    <th data-sortable="false" data-field="groups">{{ Lang::get('general.groups') }}</th>
                    <th data-sortable="true" data-field="notes">{{ Lang::get('general.notes') }}</th>
+                   <th data-sortable="true" data-field="activated">{{ Lang::get('general.activated') }}</th>
                    <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" >{{ Lang::get('table.actions') }}</th>
                </tr>
            </thead>