StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More work on the API utilizing Laravel 5.5 exception rendering

Browse source 
Also corrects API format to maintain JSONAPI spec
This commit is contained in:
Dane Everitt 2017-12-17 14:57:05 -06:00
parent f30f4b45ba
commit 54b6fb5ebd
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
28 changed files with 464 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/API/Admin/Users/UserController.php
View file

@ -11,8 +11,8 @@ use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Services\Users\UserUpdateService;
use Pterodactyl\Services\Users\UserCreationService;
use Pterodactyl\Services\Users\UserDeletionService;
use Pterodactyl\Transformers\Admin\UserTransformer;
use Pterodactyl\Http\Requests\Admin\UserFormRequest;
use Pterodactyl\Transformers\Api\Admin\UserTransformer;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
@ -83,7 +83,7 @@ class UserController extends Controller
->withResourceName('user')
->paginateWith(new IlluminatePaginatorAdapter($users));
if (config('pterodactyl.api.include_on_list') && $request->has('include')) {
if (config('pterodactyl.api.include_on_list') && $request->filled('include')) {
$fractal->parseIncludes(explode(',', $request->input('include')));
}
@ -104,7 +104,7 @@ class UserController extends Controller
->transformWith(new UserTransformer($request))
->withResourceName('user');
if ($request->has('include')) {
if ($request->filled('include')) {
$fractal->parseIncludes(explode(',', $request->input('include')));
}