Don't require auto-allocation settings if not enabled; closes #3085

This commit is contained in:
Dane Everitt 2021-02-17 21:11:23 -08:00
parent 245989967b
commit 94ea9c37d0
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 15 additions and 4 deletions

View file

@ -20,8 +20,19 @@ class AdvancedSettingsFormRequest extends AdminFormRequest
'pterodactyl:guzzle:timeout' => 'required|integer|between:1,60', 'pterodactyl:guzzle:timeout' => 'required|integer|between:1,60',
'pterodactyl:guzzle:connect_timeout' => 'required|integer|between:1,60', 'pterodactyl:guzzle:connect_timeout' => 'required|integer|between:1,60',
'pterodactyl:client_features:allocations:enabled' => 'required|in:true,false', 'pterodactyl:client_features:allocations:enabled' => 'required|in:true,false',
'pterodactyl:client_features:allocations:range_start' => 'required|integer|between:1024,65535', 'pterodactyl:client_features:allocations:range_start' => [
'pterodactyl:client_features:allocations:range_end' => 'required|integer|between:1024,65535', 'nullable',
'required_if:pterodactyl:client_features:allocations:enabled,true',
'integer',
'between:1024,65535',
],
'pterodactyl:client_features:allocations:range_end' => [
'nullable',
'required_if:pterodactyl:client_features:allocations:enabled,true',
'integer',
'between:1024,65535',
'gt:pterodactyl:client_features:allocations:range_start',
],
]; ];
} }

View file

@ -101,14 +101,14 @@
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label class="control-label">Starting Port</label> <label class="control-label">Starting Port</label>
<div> <div>
<input type="number" required class="form-control" name="pterodactyl:client_features:allocations:range_start" value="{{ old('pterodactyl:client_features:allocations:range_start', config('pterodactyl.client_features.allocations.range_start')) }}"> <input type="number" class="form-control" name="pterodactyl:client_features:allocations:range_start" value="{{ old('pterodactyl:client_features:allocations:range_start', config('pterodactyl.client_features.allocations.range_start')) }}">
<p class="text-muted small">The starting port in the range that can be automatically allocated.</p> <p class="text-muted small">The starting port in the range that can be automatically allocated.</p>
</div> </div>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label class="control-label">Ending Port</label> <label class="control-label">Ending Port</label>
<div> <div>
<input type="number" required class="form-control" name="pterodactyl:client_features:allocations:range_end" value="{{ old('pterodactyl:client_features:allocations:range_end', config('pterodactyl.client_features.allocations.range_end')) }}"> <input type="number" class="form-control" name="pterodactyl:client_features:allocations:range_end" value="{{ old('pterodactyl:client_features:allocations:range_end', config('pterodactyl.client_features.allocations.range_end')) }}">
<p class="text-muted small">The ending port in the range that can be automatically allocated.</p> <p class="text-muted small">The ending port in the range that can be automatically allocated.</p>
</div> </div>
</div> </div>