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

Merge pull request #1887 from matthewpi/feature/server-transfers

Browse source 
Add migration and validation rules for 'threads' column, fixes other errors on nest/egg pages
This commit is contained in:
Dane Everitt 2020-04-03 22:54:29 -07:00 • committed by GitHub
commit 6d1226a0c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/views/admin/eggs/variables.blade.php
View file

@ -48,7 +48,7 @@
<div class="box-header with-border">
<h3 class="box-title">{{ $variable->name }}</h3>
</div>
<form action="{{ route('admin.nests.egg.variables.edit', ['id' => $egg->id, 'variable' => $variable->id]) }}" method="POST">
<form action="{{ route('admin.nests.egg.variables.edit', ['egg' => $egg->id, 'variable' => $variable->id]) }}" method="POST">
<div class="box-body">
<div class="form-group">
<label class="form-label">Name</label>

2
resources/views/admin/eggs/view.blade.php
View file

@ -160,7 +160,7 @@
<div class="box-footer">
{!! csrf_field() !!}
<button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Save</button>
<a href="{{ route('admin.nests.egg.export', ['option' => $egg->id]) }}" class="btn btn-sm btn-info pull-right" style="margin-right:10px;">Export</a>
<a href="{{ route('admin.nests.egg.export', $egg->id) }}" class="btn btn-sm btn-info pull-right" style="margin-right:10px;">Export</a>
<button id="deleteButton" type="submit" name="_method" value="DELETE" class="btn btn-danger btn-sm muted muted-hover">
<i class="fa fa-trash-o"></i>
</button>

2
resources/views/admin/packs/view.blade.php
View file

@ -138,7 +138,7 @@
{!! csrf_field() !!}
<button type="submit" class="btn btn-sm btn-success pull-right">Export</button>
</form>
<form action="{{ route('admin.packs.view.export', ['id' => $pack->id, 'files' => 'with-files']) }}" method="POST">
<form action="{{ route('admin.packs.view.export', ['pack' => $pack->id, 'files' => 'with-files']) }}" method="POST">
{!! csrf_field() !!}
<button type="submit" class="btn btn-sm pull-right muted muted-hover" style="margin-right:10px;">Export with Archive</button>
</form>

8
resources/views/admin/servers/view/index.blade.php
View file

@ -75,7 +75,13 @@
</tr>
<tr>
<td>CPU Threads</td>
<td><code>{{ $server->threads }}</code></td>
<td>
@if($server->threads != null)
<code>{{ $server->threads }}</code>
@else
<code>n/a</code>
@endif
</td>
</tr>
<tr>
<td>Default Connection</td>