sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix empty server descriptions throwing SQL errors, closes #842

This commit is contained in:
Dane Everitt 2018-01-01 12:23:45 -06:00
parent 4457634127
commit 958c29cfbf
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Server.php
View File

@ -76,7 +76,7 @@ class Server extends Model implements CleansAttributes, ValidableContract
'owner_id' => 'exists:users,id', 'owner_id' => 'exists:users,id',
'name' => 'regex:/^([\w .-]{1,200})$/', 'name' => 'regex:/^([\w .-]{1,200})$/',
'node_id' => 'exists:nodes,id', 'node_id' => 'exists:nodes,id',
'description' => 'nullable|string', 'description' => 'string',
'memory' => 'numeric|min:0', 'memory' => 'numeric|min:0',
'swap' => 'numeric|min:-1', 'swap' => 'numeric|min:-1',
'io' => 'numeric|between:10,1000', 'io' => 'numeric|between:10,1000',

6
app/Services/Servers/DetailsModificationService.php
View File

@ -95,9 +95,9 @@ class DetailsModificationService
$this->connection->beginTransaction(); $this->connection->beginTransaction();
$this->repository->withoutFresh()->update($server->id, [ $this->repository->withoutFresh()->update($server->id, [
'owner_id' => array_get($data, 'owner_id') ?? $server->owner_id, 'owner_id' => array_get($data, 'owner_id'),
'name' => array_get($data, 'name') ?? $server->name, 'name' => array_get($data, 'name'),
'description' => array_get($data, 'description') ?? $server->description, 'description' => array_get($data, 'description', ''),
], true, true); ], true, true);
if (array_get($data, 'owner_id') != $server->owner_id) { if (array_get($data, 'owner_id') != $server->owner_id) {

3
app/Services/Servers/ServerCreationService.php
View File

@ -106,6 +106,7 @@ class ServerCreationService
* @throws \Pterodactyl\Exceptions\DisplayException * @throws \Pterodactyl\Exceptions\DisplayException
* @throws \Pterodactyl\Exceptions\Model\DataValidationException * @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
* @throws \Illuminate\Validation\ValidationException
*/ */
public function create(array $data) public function create(array $data)
{ {
@ -117,7 +118,7 @@ class ServerCreationService
'uuidShort' => str_random(8), 'uuidShort' => str_random(8),
'node_id' => array_get($data, 'node_id'), 'node_id' => array_get($data, 'node_id'),
'name' => array_get($data, 'name'), 'name' => array_get($data, 'name'),
'description' => array_get($data, 'description'), 'description' => array_get($data, 'description', ''),
'skip_scripts' => isset($data['skip_scripts']), 'skip_scripts' => isset($data['skip_scripts']),
'suspended' => false, 'suspended' => false,
'owner_id' => array_get($data, 'owner_id'), 'owner_id' => array_get($data, 'owner_id'),