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

Merge branch 'develop' into feature/PTDL-472

Browse Source
This commit is contained in:
Dane Everitt
2017-06-25 15:36:39 -05:00
parent 4ee9d38ad1 ddb98df4af
commit b7b046c044
24 changed files with 672 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Repositories/Old/old_ServerRepository.php
View File

@@ -535,7 +535,7 @@ class old_ServerRepository
}
$newPorts = true;
$firstNewAllocation = (is_null($firstNewAllocation)) ? $model->id : $firstNewAllocation;
$firstNewAllocation = $firstNewAllocation ?? $model;
$model->update([
'server_id' => $server->id,
]);
@@ -555,7 +555,8 @@ class old_ServerRepository
}
// New Allocation, set as the default.
$server->allocation_id = $firstNewAllocation;
$server->allocation_id = $firstNewAllocation->id;
$newBuild['default'] = ['ip' => $firstNewAllocation->ip, 'port' => $firstNewAllocation->port];
}
$newPorts = true;