Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-26 02:52:30 +01:00
Code Issues Releases Wiki Activity

allow emptying server description, closes #442

Browse Source
This commit is contained in:
Dane Everitt 2017-05-23 23:00:31 -05:00
parent 0e48c94918
commit 9116547e98
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -15,6 +15,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
### Changed ### Changed
* Renamed session cookies from `laravel_session` to `pterodactyl_session`. * Renamed session cookies from `laravel_session` to `pterodactyl_session`.
* Sessions are now encrypted before being stored as an additional layer of security. * Sessions are now encrypted before being stored as an additional layer of security.
* It is now possible to clear out a server description and have it be blank, rather than throwing an error about the field being required.
## v0.6.0 (Courageous Carniadactylus) ## v0.6.0 (Courageous Carniadactylus)
### Fixed ### Fixed

9
app/Http/Controllers/Admin/ServersController.php
View File

@ -273,9 +273,12 @@ class ServersController extends Controller
{ {
$repo = new ServerRepository; $repo = new ServerRepository;
try { try {
$repo->updateDetails($id, $request->intersect([ $repo->updateDetails($id, array_merge(
'owner_id', 'name', 'description', 'reset_token', $request->only('description'),
])); $request->intersect([
'owner_id', 'name', 'reset_token',
])
));
Alert::success('Server details were successfully updated.')->flash(); Alert::success('Server details were successfully updated.')->flash();
} catch (DisplayValidationException $ex) { } catch (DisplayValidationException $ex) {

2
app/Repositories/ServerRepository.php
View File

@ -370,7 +370,7 @@ class ServerRepository
$validator = Validator::make($data, [ $validator = Validator::make($data, [
'owner_id' => 'sometimes|required|integer|exists:users,id', 'owner_id' => 'sometimes|required|integer|exists:users,id',
'name' => 'sometimes|required|regex:([\w .-]{1,200})', 'name' => 'sometimes|required|regex:([\w .-]{1,200})',
'description' => 'sometimes|required|string', 'description' => 'sometimes|nullable|string',
'reset_token' => 'sometimes|required|accepted', 'reset_token' => 'sometimes|required|accepted',
]); ]);