StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/vuejs' into feature/vuejs-account

Browse source
This commit is contained in:
Dane Everitt 2018-07-02 21:01:04 -07:00
commit 603b8a3094
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
52 changed files with 666 additions and 529 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php
View file

@ -74,7 +74,7 @@ class StoreNodeRequest extends ApplicationApiRequest
$response = parent::validated();
$response['daemonListen'] = $response['daemon_listen'];
$response['daemonSFTP'] = $response['daemon_sftp'];
$response['daemonBase'] = $response['daemon_base'];
$response['daemonBase'] = $response['daemon_base'] ?? (new Node)->getAttribute('daemonBase');
unset($response['daemon_base'], $response['daemon_listen'], $response['daemon_sftp']);

2
app/Http/Requests/Server/Subuser/SubuserStoreFormRequest.php
View file

@ -25,7 +25,7 @@ class SubuserStoreFormRequest extends ServerFormRequest
{
return [
'email' => 'required|email',
'permissions' => 'present|array',
'permissions' => 'sometimes|array',
];
}
}