ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added location to user listing

Browse Source
This commit is contained in:
snipe
2015-08-06 03:59:23 -07:00
parent 56f490cef9
commit 106ed6a9a0
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/UsersController.php
+10 -3
View File
@@ -691,7 +691,7 @@ class UsersController extends AdminController
public function getDatatable($status = null)
{
$users = User::with('assets','licenses','manager','sentryThrottle');
$users = User::with('assets','licenses','manager','userloc','sentryThrottle');
switch ($status) {
case 'deleted':
@@ -747,6 +747,13 @@ class UsersController extends AdminController
}
})
->addColumn('location',function($users)
{
if ($users->userloc) {
return '<a title="'.$users->userloc->name.'" href="users/'.$users->location_id.'/view">'.$users->userloc->name.'</a>';
}
})
->addColumn('assets',function($users)
{
return $users->assets->count();
@@ -762,8 +769,8 @@ class UsersController extends AdminController
})
->addColumn($actions)
->searchColumns('name','email','manager','activated', 'licenses','assets')
->orderColumns('name','email','manager','activated', 'licenses','assets')
->searchColumns('name','email','manager','activated','licenses','location','assets')
->orderColumns('name','email','manager','activated', 'licenses','location','assets')
->make();
}