MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-18 22:33:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/react-admin

Browse Source
This commit is contained in:
Matthew Penner
2021-05-18 17:07:25 -06:00
parent 8a24c1a142 010ef8621b
commit a3b59f24af
95 changed files with 2671 additions and 1777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php
View File

@@ -90,7 +90,7 @@ class ServerDetailsController extends Controller
/** @var \Pterodactyl\Models\Server[] $servers */
$servers = Server::query()
->select('servers.*')
->selectRaw('started.metadata->>"$.backup_uuid" as backup_uuid')
->selectRaw('JSON_UNQUOTE(JSON_EXTRACT(started.metadata, "$.backup_uuid")) as backup_uuid')
->leftJoinSub(function (Builder $builder) {
$builder->select('*')->from('audit_logs')
->where('action', AuditLog::SERVER__BACKUP_RESTORE_STARTED)