MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-19 14:53:45 +02:00
Code Issues Packages Projects 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
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
app/Repositories/ServerRepository.php
View File

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