Fixes bug in people display

2015-10-21 23:15:35 -07:00
parent dba7983189
commit 440bc1a4b4
1 changed files with 1 additions and 1 deletions
@@ -909,7 +909,7 @@ class UsersController extends AdminController {
                            .'<a href="mailto:'.$user->email.'" class="hidden-xs hidden-sm"><i class="fa fa-envelope"></i></a>'
                            .'</span>' : '',
                'username'         => $user->username,
-                'location'      => ($user->location_id!='') ? $user->userloc->name : '',
+                'location'      => ($user->userloc) ? $user->userloc->name : '',
                'manager'         => ($user->manager) ? '<a title="' . $user->manager->fullName() . '" href="users/' . $user->manager->id . '/view">' . $user->manager->fullName() . '</a>' : '',
                'assets'        => $user->assets->count(),
                'licenses'        => $user->licenses->count(),