DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 13:57:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #4294 - pass correct group ID for group user listings

Browse source
This commit is contained in:
snipe 2017-10-24 04:39:47 -07:00
parent c18220069d
commit 7d64ab3158
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,7 +67,7 @@ class UsersController extends Controller
} }
if ($request->has('group_id')) { if ($request->has('group_id')) {
$users = $users->ByGroup($request->has('group_id')); $users = $users->ByGroup($request->get('group_id'));
} }
if ($request->has('department_id')) { if ($request->has('department_id')) {

2
app/Models/User.php
View file

@ -381,7 +381,7 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
public function scopeByGroup($query, $id) { public function scopeByGroup($query, $id) {
return $query->whereHas('groups', function ($query) use ($id) { return $query->whereHas('groups', function ($query) use ($id) {
$query->where('id', '=', $id); $query->where('groups.id', '=', $id);
}); });
} }