From abd0acbe9d48a0be7dfbd1186aa096e08e53fd9b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 15 Sep 2015 09:58:56 -0700
Subject: [PATCH] Add username to user's list view

---
 app/config/version.php                    |  4 ++--
 app/controllers/admin/UsersController.php | 19 +++++++++++--------
 app/views/backend/users/index.blade.php   |  1 +
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index a7defa684f..1c40ef4b24 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0-117',
-  'hash_version' => 'v2.0-117-gc6b6ccc',
+  'app_version' => 'v2.0-118',
+  'hash_version' => 'v2.0-118-gf9dc576',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
index 111beecbf6..5110e8dc42 100755
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -876,6 +876,9 @@ class UsersController extends AdminController {
                                 return '';
                             }
                         })
+                        ->addColumn('username', function($users) {
+                            return $users->username;
+                        })
                         ->addColumn('manager', function($users) {
                             if ($users->manager) {
                                 return '<a title="' . $users->manager->fullName() . '" href="users/' . $users->manager->id . '/view">' . $users->manager->fullName() . '</a>';
@@ -906,8 +909,8 @@ class UsersController extends AdminController {
                             return $group_names;
                         })
                         ->addColumn($actions)
-                        ->searchColumns('name', 'email', 'manager', 'activated', 'groups', 'location')
-                        ->orderColumns('name', 'email', 'manager', 'activated', 'licenses', 'assets', 'accessories', 'consumables', 'groups', 'location')
+                        ->searchColumns('name', 'email', 'username', 'manager', 'activated', 'groups', 'location')
+                        ->orderColumns('name', 'email', 'username', 'manager', 'activated', 'licenses', 'assets', 'accessories', 'consumables', 'groups', 'location')
                         ->make();
     }
 
@@ -1043,13 +1046,13 @@ class UsersController extends AdminController {
         // Selected permissions
         $selectedPermissions = Input::old('permissions', array('superuser' => -1));
         $this->encodePermissions($selectedPermissions);
-        
+
         $location_list = locationsList();
-                        
+
         // Show the page
         return View::make('backend/users/ldap', compact('groups', 'selectedGroups', 'permissions', 'selectedPermissions'))
                         ->with('location_list', $location_list);
-        
+
     }
 
     /**
@@ -1064,7 +1067,7 @@ class UsersController extends AdminController {
         'username' => 'required|min:2|unique:users,username',
         'email' => 'email|unique:users,email',
     );
-    
+
     /**
      * Declare the rules for the form validation.
      *
@@ -1083,14 +1086,14 @@ class UsersController extends AdminController {
     public function postLDAP() {
 
         $location_id = Input::get('location_id');
-        
+
         $formValidator = Validator::make(Input::all(), $this->ldapFormInputValidationRules);
         // If validation fails, we'll exit the operation now.
         if ($formValidator->fails()) {
             // Ooops.. something went wrong
             return Redirect::back()->withInput()->withErrors($formValidator);
         }
-        
+
         $ldap_version = Config::get('ldap.version');
         $url = Config::get('ldap.url');
         $username = Config::get('ldap.username');
diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
index 4e23a5c2a7..1ac7081bee 100755
--- a/app/views/backend/users/index.blade.php
+++ b/app/views/backend/users/index.blade.php
@@ -44,6 +44,7 @@
         ->addColumn('<div class="text-center"><input type="checkbox" id="checkAll" style="padding-left: 0px;"></div>',
     	    Lang::get('admin/users/table.name'),
     	    '<i class="fa fa-envelope fa-lg"></i>',
+            Lang::get('admin/users/table.username'),
     	    Lang::get('admin/users/table.manager'),
             Lang::get('admin/users/table.location'),
             '<i class="fa fa-barcode fa-lg"></i>',