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

fix saving of egg variable values, closes #905

Browse source
This commit is contained in:
Dane Everitt 2018-02-03 12:36:57 -06:00
parent d9355b93b4
commit 0b00895261
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -8,6 +8,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
* `[rc.1]` — Fixes exception thrown when revoking user sessions. * `[rc.1]` — Fixes exception thrown when revoking user sessions.
* `[rc.1]` — Fixes exception that would occur when trying to delete allocations from a node. * `[rc.1]` — Fixes exception that would occur when trying to delete allocations from a node.
* `[rc.1]` — Fixes exception thown when attempting to adjust mail settings as well as a validation error thrown afterwards. * `[rc.1]` — Fixes exception thown when attempting to adjust mail settings as well as a validation error thrown afterwards.
* `[rc.1]` — Fixes bug preventing modification of the default value for an Egg variable.
## v0.7.0-rc.1 (Derelict Dermodactylus) ## v0.7.0-rc.1 (Derelict Dermodactylus)
### Fixed ### Fixed

9
app/Http/Requests/Admin/Egg/EggVariableFormRequest.php
View file

@ -20,6 +20,7 @@ class EggVariableFormRequest extends AdminFormRequest
'env_variable' => 'required|regex:/^[\w]{1,255}$/|notIn:' . EggVariable::RESERVED_ENV_NAMES, 'env_variable' => 'required|regex:/^[\w]{1,255}$/|notIn:' . EggVariable::RESERVED_ENV_NAMES,
'options' => 'sometimes|required|array', 'options' => 'sometimes|required|array',
'rules' => 'bail|required|string', 'rules' => 'bail|required|string',
'default_value' => 'present',
]; ];
} }
@ -38,10 +39,8 @@ class EggVariableFormRequest extends AdminFormRequest
// If rules is not a string it is already violating the rule defined above // If rules is not a string it is already violating the rule defined above
// so just skip the addition of default value rules since this request // so just skip the addition of default value rules since this request
// will fail anyways. // will fail anyways.
if (! is_string($rules)) { $validator->sometimes('default_value', $rules, function () use ($rules) {
return; return is_string($rules);
} });
$validator->addRules(['default_value' => $rules]);
} }
} }