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

Added consumables to user matrix for #782

Browse Source
This commit is contained in:
snipe
2015-06-09 20:05:24 -07:00
parent e4517a8782
commit d0189fb076
4 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/UsersController.php
+8 -3
View File
@@ -687,7 +687,7 @@ class UsersController extends AdminController
public function getDatatable($status = null)
{
$users = User::with('assets','accessories','licenses','manager','sentryThrottle','groups','userloc');
$users = User::with('assets','accessories','consumables','licenses','manager','sentryThrottle','groups','userloc');
switch ($status) {
case 'deleted':
@@ -765,12 +765,17 @@ class UsersController extends AdminController
{
return $users->accessories->count();
})
->addColumn('consumables',function($users)
{
return $users->consumables->count();
})
->addColumn('groups',function($users)
{
$group_names = '';
foreach ($users->groups as $group) {
$group_names .= '<a href="'.Config::get('app.url').'/admin/groups/'.$group->id.'/edit">'.$group->name.'</a> ';
$group_names .= '<a href="'.Config::get('app.url').'/admin/groups/'.$group->id.'/edit" class="label label-default">'.$group->name.'</a> ';
}
return $group_names;
})
@@ -778,7 +783,7 @@ class UsersController extends AdminController
->addColumn($actions)
->searchColumns('name','email','manager','activated','groups','location')
->orderColumns('name','email','manager','activated', 'licenses','assets','accessories','groups','location')
->orderColumns('name','email','manager','activated', 'licenses','assets','accessories','consumables','groups','location')
->make();
}