dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes deployment issue with new servers due to DB changes.

Browse Source
This commit is contained in:
Dane Everitt 2017-02-17 12:08:11 -05:00
parent f5eb309950
commit 008b18e19a
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -3,6 +3,10 @@ This file is a running track of new features and fixes to each version of the pa
This project follows [Semantic Versioning](http://semver.org) guidelines. This project follows [Semantic Versioning](http://semver.org) guidelines.
## v0.6.0-pre.2 (Courageous Carniadactylus)
### Fixed
* `[pre.2]` — Fixes bug where servers could not be manually deployed to nodes due to a broken SQL call.
## v0.6.0-pre.2 (Courageous Carniadactylus) ## v0.6.0-pre.2 (Courageous Carniadactylus)
### Fixed ### Fixed
* `[pre.1]` — Fixes bug with database seeders that prevented correctly installing the panel. * `[pre.1]` — Fixes bug with database seeders that prevented correctly installing the panel.

2
app/Repositories/ServerRepository.php
View File

@ -216,7 +216,7 @@ class ServerRepository
// Check Overallocation // Check Overallocation
if (! $autoDeployed) { if (! $autoDeployed) {
if (is_numeric($node->memory_overallocate) || is_numeric($node->disk_overallocate)) { if (is_numeric($node->memory_overallocate) || is_numeric($node->disk_overallocate)) {
$totals = Models\Server::select(DB::raw('SUM(memory) as memory, SUM(disk) as disk'))->where('node', $node->id)->first(); $totals = Models\Server::select(DB::raw('SUM(memory) as memory, SUM(disk) as disk'))->where('node_id', $node->id)->first();
// Check memory limits // Check memory limits
if (is_numeric($node->memory_overallocate)) { if (is_numeric($node->memory_overallocate)) {