Fix user search in admin area; closes #2100

This commit is contained in:
Dane Everitt 2020-09-13 12:35:48 -07:00
parent 88300e5448
commit 8b4bd3945d
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
6 changed files with 16 additions and 7 deletions

View file

@ -185,11 +185,20 @@ class UserController extends Controller
*/
public function json(Request $request)
{
$users = QueryBuilder::for(User::query())->allowedFilters(['email'])->paginate(25);
// Handle single user requests.
if ($request->query('user_id')) {
return $this->repository->filterById($request->input('user_id'));
$user = User::query()->findOrFail($request->input('user_id'));
$user->md5 = md5(strtolower($user->email));
return $user;
}
return $this->repository->filterUsersByQuery($request->input('q'));
return $users->map(function ($item) {
$item->md5 = md5(strtolower($item->email));
return $item;
});
}
}