Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix validation error when trying to save certain eggs, closes #829

Browse source
This commit is contained in:
Dane Everitt 2017-12-30 16:05:22 -06:00
parent b9d67459b2
commit 321d00c89e
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -12,6 +12,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
* `[beta.2]` — Fixes bug that caused incorrect rendering of CPU usage on server graphs due to missing variable. * `[beta.2]` — Fixes bug that caused incorrect rendering of CPU usage on server graphs due to missing variable.
* `[beta.2]` — Fixes bug causing schedules to be un-deletable. * `[beta.2]` — Fixes bug causing schedules to be un-deletable.
* `[beta.2]` — Fixes bug that prevented the deletion of nodes due to an allocation deletion cascade issue with the SQL schema. * `[beta.2]` — Fixes bug that prevented the deletion of nodes due to an allocation deletion cascade issue with the SQL schema.
* `[beta.2]` — Fixes a bug causing eggs not extending other eggs to fail validation.
### Changed ### Changed
* Revoking the administrative status for an admin will revoke all authentication tokens currently assigned to their account. * Revoking the administrative status for an admin will revoke all authentication tokens currently assigned to their account.

2
resources/themes/pterodactyl/admin/eggs/new.blade.php
View file

@ -83,7 +83,7 @@
<div class="form-group"> <div class="form-group">
<label for="pConfigFrom" class="form-label">Copy Settings From</label> <label for="pConfigFrom" class="form-label">Copy Settings From</label>
<select name="config_from" id="pConfigFrom" class="form-control"> <select name="config_from" id="pConfigFrom" class="form-control">
<option value="0">None</option> <option value="">None</option>
</select> </select>
<p class="text-muted small">If you would like to default to settings from another Egg select it from the dropdown above.</p> <p class="text-muted small">If you would like to default to settings from another Egg select it from the dropdown above.</p>
</div> </div>

2
resources/themes/pterodactyl/admin/eggs/view.blade.php
View file

@ -125,7 +125,7 @@
<div class="form-group"> <div class="form-group">
<label for="pConfigFrom" class="form-label">Copy Settings From</label> <label for="pConfigFrom" class="form-label">Copy Settings From</label>
<select name="config_from" id="pConfigFrom" class="form-control"> <select name="config_from" id="pConfigFrom" class="form-control">
<option value="0">None</option> <option value="">None</option>
@foreach($egg->nest->eggs as $o) @foreach($egg->nest->eggs as $o)
<option value="{{ $o->id }}" {{ ($egg->config_from !== $o->id) ?: 'selected' }}>{{ $o->name }} &lt;{{ $o->author }}&gt;</option> <option value="{{ $o->id }}" {{ ($egg->config_from !== $o->id) ?: 'selected' }}>{{ $o->name }} &lt;{{ $o->author }}&gt;</option>
@endforeach @endforeach