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

Fix server startup dropdown for egg being incorrect, fixes #778

Browse source
This commit is contained in:
Dane Everitt 2017-11-25 12:27:08 -06:00
parent 34db4102b9
commit 0bb44a4972
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/Admin/ServersController.php
View file

@ -319,14 +319,14 @@ class ServersController extends Controller
/**
* Display startup configuration page for a server.
*
* @param int $server
* @param \Pterodactyl\Models\Server $server
* @return \Illuminate\View\View
*
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
public function viewStartup($server)
public function viewStartup(Server $server)
{
$parameters = $this->repository->getVariablesWithValues($server, true);
$parameters = $this->repository->getVariablesWithValues($server->id, true);
if (! $parameters->server->installed) {
abort(404);
}
@ -334,6 +334,7 @@ class ServersController extends Controller
$nests = $this->nestRepository->getWithEggs();
Javascript::put([
'server' => $server,
'nests' => $nests->map(function ($item) {
return array_merge($item->toArray(), [
'eggs' => $item->eggs->keyBy('id')->toArray(),