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

backfill fixes from 65957e7e to address #470 in active release

Browse source
This commit is contained in:
Dane Everitt 2017-06-18 20:39:04 -05:00
parent 32b639e3eb
commit 1c5f892049
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Admin/OptionController.php
View file

@ -209,7 +209,7 @@ class OptionController extends Controller
try { try {
if ($request->input('action') !== 'delete') { if ($request->input('action') !== 'delete') {
$variable = $repo->update($variable, $request->intersect([ $variable = $repo->update($variable, $request->only([
'name', 'description', 'env_variable', 'name', 'description', 'env_variable',
'default_value', 'options', 'rules', 'default_value', 'options', 'rules',
])); ]));

9
app/Repositories/VariableRepository.php
View file

@ -123,12 +123,11 @@ class VariableRepository
$variable = ServiceVariable::findOrFail($id); $variable = ServiceVariable::findOrFail($id);
$validator = Validator::make($data, [ $validator = Validator::make($data, [
'name' => 'sometimes|required|string|min:1|max:255', 'name' => 'required|string|min:1|max:255',
'description' => 'sometimes|nullable|string', 'description' => 'nullable|string',
'env_variable' => 'sometimes|required|regex:/^[\w]{1,255}$/', 'env_variable' => 'required|regex:/^[\w]{1,255}$/',
'default_value' => 'string', 'rules' => 'bail|required|string',
'options' => 'sometimes|required|array', 'options' => 'sometimes|required|array',
'rules' => 'bail|sometimes|required|string|min:1',
]); ]);
// Ensure the default value is allowed by the rules provided. // Ensure the default value is allowed by the rules provided.