Fix bug with server default ports not being updated properly

DaneEveritt · DaneEveritt · commit dcab84b1da19 · 2017-06-18T21:03:39.000-05:00
diff --git a/app/Repositories/ServerRepository.php b/app/Repositories/ServerRepository.php
@@ -535,7 +535,7 @@ public function changeBuild($id, array $data)
                     }
 
                     $newPorts = true;
-                    $firstNewAllocation = (is_null($firstNewAllocation)) ? $model->id : $firstNewAllocation;
+                    $firstNewAllocation = $firstNewAllocation ?? $model;
                     $model->update([
                         'server_id' => $server->id,
                     ]);
@@ -555,7 +555,8 @@ public function changeBuild($id, array $data)
                         }
 
                         // 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;

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ public function changeBuild($id, array $data)`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`$newPorts = true;`
`538`		`- $firstNewAllocation = (is_null($firstNewAllocation)) ? $model->id : $firstNewAllocation;`
	`538`	`+ $firstNewAllocation = $firstNewAllocation ?? $model;`
`539`	`539`	`$model->update([`
`540`	`540`	`'server_id' => $server->id,`
`541`	`541`	`]);`
`@@ -555,7 +555,8 @@ public function changeBuild($id, array $data)`
`555`	`555`	`}`
`556`	`556`
`557`	`557`	`// New Allocation, set as the default.`
`558`		`- $server->allocation_id = $firstNewAllocation;`
	`558`	`+ $server->allocation_id = $firstNewAllocation->id;`
	`559`	`+ $newBuild['default'] = ['ip' => $firstNewAllocation->ip, 'port' => $firstNewAllocation->port];`
`559`	`560`	`}`
`560`	`561`
`561`	`562`	`$newPorts = true;`