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

Completed new server page with new theme.

Browse Source
This commit is contained in:
Dane Everitt
2017-02-24 18:19:03 -05:00
parent 58999913ba
commit cb6b44d4f0
7 changed files with 482 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Admin/ServersController.php
View File

@@ -26,6 +26,7 @@ namespace Pterodactyl\Http\Controllers\Admin;
use Log;
use Alert;
use Javascript;
use Pterodactyl\Models;
use Illuminate\Http\Request;
use Pterodactyl\Exceptions\DisplayException;
@@ -61,9 +62,18 @@ class ServersController extends Controller
public function getNew(Request $request)
{
$services = Models\Service::with('options.packs', 'options.variables')->get();
Javascript::put([
'services' => $services->map(function ($item) {
return array_merge($item->toArray(), [
'options' => $item->options->keyBy('id')->toArray(),
]);
})->keyBy('id'),
]);
return view('admin.servers.new', [
'locations' => Models\Location::all(),
'services' => Models\Service::all(),
'services' => $services,
]);
}
@@ -119,7 +129,7 @@ class ServersController extends Controller
{
$nodes = Models\Node::with('allocations')->where('location_id', $request->input('location'))->get();
return $nodes->map(function ($item) {
$filtered = $item->allocations->map(function($map) {
$filtered = $item->allocations->where('server_id', null)->map(function($map) {
return collect($map)->only(['id', 'ip', 'port']);
});