MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-09 18:03:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

This breaks literally the entire panel.

Browse Source
This commit is contained in:
Dane Everitt
2017-10-06 23:57:53 -05:00
parent 344c1a9885
commit df87ea0867
88 changed files with 1205 additions and 992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/API/Admin/ServiceController.php
View File

@@ -11,7 +11,7 @@ namespace Pterodactyl\Http\Controllers\API\Admin;
use Fractal;
use Illuminate\Http\Request;
use Pterodactyl\Models\Service;
use Pterodactyl\Models\Nest;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Transformers\Admin\ServiceTransformer;
@@ -28,7 +28,7 @@ class ServiceController extends Controller
$this->authorize('service-list', $request->apiKey());
return Fractal::create()
->collection(Service::all())
->collection(Nest::all())
->transformWith(new ServiceTransformer($request))
->withResourceName('service')
->toArray();
@@ -45,7 +45,7 @@ class ServiceController extends Controller
{
$this->authorize('service-view', $request->apiKey());
$service = Service::findOrFail($id);
$service = Nest::findOrFail($id);
$fractal = Fractal::create()->item($service);
if ($request->input('include')) {