Merge branch 'development' into development

2023-05-16 22:05:34 +02:00 · 2023-05-16 22:05:34 +02:00 · fec6c198d2
parent 680ffefb1e 2b0321733e
commit fec6c198d2
1 changed files with 1 additions and 0 deletions
--- a/app/Http/Controllers/ServerController.php
+++ b/app/Http/Controllers/ServerController.php
@ -393,6 +393,7 @@ class ServerController extends Controller
            $response = $this->pterodactyl->powerAction($server, 'restart');
            if ($response->failed()) return redirect()->route('servers.index')->with('error', 'Upgrade Failed! Could not restart the server:   ' . $response->json()['errors'][0]['detail']);

+
            // Remove the allocation property from the server object as it is not a column in the database
            unset($server->allocation);
            // Update the server on controlpanel