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

Merge branch 'develop' into feature/vue-serverview

Browse source
This commit is contained in:
Dane Everitt 2018-09-05 21:34:59 -07:00
commit 5ca13839cf
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
110 changed files with 7190 additions and 2093 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Api/Application/Locations/LocationController.php
View file

@ -11,6 +11,7 @@ use Pterodactyl\Services\Locations\LocationDeletionService;
use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
use Pterodactyl\Transformers\Api\Application\LocationTransformer;
use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
use Pterodactyl\Http\Requests\Api\Application\Locations\GetLocationRequest;
use Pterodactyl\Http\Requests\Api\Application\Locations\GetLocationsRequest;
use Pterodactyl\Http\Requests\Api\Application\Locations\DeleteLocationRequest;
use Pterodactyl\Http\Requests\Api\Application\Locations\UpdateLocationRequest;
@ -77,7 +78,7 @@ class LocationController extends ApplicationApiController
/**
* Return a single location.
*
* @param \Pterodactyl\Http\Controllers\Api\Application\Locations\GetLocationRequest $request
* @param \Pterodactyl\Http\Requests\Api\Application\Locations\GetLocationRequest $request
* @return array
*/
public function view(GetLocationRequest $request): array

2
app/Http/Controllers/Api/Application/Nodes/NodeController.php
View file

@ -124,7 +124,7 @@ class NodeController extends ApplicationApiController
*/
public function update(UpdateNodeRequest $request): array
{
$node = $this->updateService->returnUpdatedModel()->handle(
$node = $this->updateService->handle(
$request->getModel(Node::class), $request->validated()
);