MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-18 14:23:44 +02:00
Code Issues Packages Projects Releases 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
parent 7711b697ad 48cb01f438
commit 603b8a3094
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',
];
}
}