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

Merge branch 'develop' into feature/api-key-changes

Browse source
This commit is contained in:
Dane Everitt 2017-11-26 13:20:25 -06:00
commit 80ddd5b659
21 changed files with 124 additions and 136 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(),

3
app/Http/Controllers/Server/ConsoleController.php
View file

@ -38,6 +38,9 @@ class ConsoleController extends Controller
$server = $request->attributes->get('server');
$this->setRequest($request)->injectJavascript([
'server' => [
'cpu' => $server->cpu,
],
'meta' => [
'saveFile' => route('server.files.save', $server->uuidShort),
'csrfToken' => csrf_token(),

4
app/Http/Requests/Admin/DatabaseHostFormRequest.php
View file

@ -18,6 +18,10 @@ class DatabaseHostFormRequest extends AdminFormRequest
*/
public function rules()
{
if (! $this->has('node_id')) {
$this->merge(['node_id' => null]);
}
if ($this->method() !== 'POST') {
return DatabaseHost::getUpdateRulesForId($this->route()->parameter('host')->id);
}