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

Fix location view display. Migrate to api controller methods and fix missing bits to make this happen. Show manager on the location view page.

Browse Source
This commit is contained in:
Daniel Meltzer
2017-05-22 19:49:03 -05:00
parent f0d78091d2
commit dfea47a272
5 changed files with 21 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/UsersController.php
+8 -4
View File
@@ -40,8 +40,8 @@ class UsersController extends Controller
'users.deleted_at',
'users.department_id',
'users.activated'
])->with('manager', 'groups', 'userloc', 'company', 'department','throttle','assets','licenses','accessories','consumables')
->withCount('assets','licenses','accessories','consumables');
])->with('manager', 'groups', 'userloc', 'company', 'department', 'throttle', 'assets', 'licenses', 'accessories', 'consumables')
->withCount('assets', 'licenses', 'accessories', 'consumables');
$users = Company::scopeCompanyables($users);
@@ -50,11 +50,15 @@ class UsersController extends Controller
}
if ($request->has('company_id')) {
$users = $users->where('company_id','=',$request->input('company_id'));
$users = $users->where('company_id', '=', $request->input('company_id'));
}
if ($request->has('department_id')) {
$users = $users->where('department_id','=',$request->input('department_id'));
$users = $users->where('department_id', '=', $request->input('department_id'));
}
if ($request->has('location_id')) {
$users = $users->where('location_id', '=', $request->input('location_id'));
}
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';