DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Include depts in returned list, sort by dept

Browse source
This commit is contained in:
snipe 2017-05-23 02:46:55 -07:00
parent cefb20d46f
commit 811ddd2f67
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Api/UsersController.php
View file

@ -38,8 +38,9 @@ class UsersController extends Controller
'users.company_id', 'users.company_id',
'users.last_login', 'users.last_login',
'users.deleted_at', 'users.deleted_at',
'users.department_id',
'users.activated' 'users.activated'
])->with('manager', 'groups', 'userloc', 'company', 'throttle','assets','licenses','accessories','consumables') ])->with('manager', 'groups', 'userloc', 'company', 'department','throttle','assets','licenses','accessories','consumables')
->withCount('assets','licenses','accessories','consumables'); ->withCount('assets','licenses','accessories','consumables');
$users = Company::scopeCompanyables($users); $users = Company::scopeCompanyables($users);
@ -67,6 +68,9 @@ class UsersController extends Controller
case 'location': case 'location':
$users = $users->OrderLocation($order); $users = $users->OrderLocation($order);
break; break;
case 'department':
$users = $users->OrderDepartment($order);
break;
default: default:
$allowed_columns = $allowed_columns =
[ [