beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #158 from ControlPanel-gg/server_delete

Browse source 
fixed a bug: is ptero is down don't delete the server from our side
This commit is contained in:
AVMG 2021-08-02 16:47:53 +02:00 committed by GitHub
parent 27028c9711 a07749e04b
commit 692aee69ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/Admin/ServerController.php
View file

@ -90,8 +90,12 @@ class ServerController extends Controller
*/
public function destroy(Server $server)
{
$server->delete();
return redirect()->back()->with('success', 'server has been removed!');
try {
$server->delete();
return redirect()->route('admin.servers.index')->with('success', 'server removed');
} catch (Exception $e) {
return redirect()->route('admin.servers.index')->with('error', 'An exception has occurred while trying to remove a resource "' . $e->getMessage() . '"');
}
}
/**

2
app/Http/Controllers/ServerController.php
View file

@ -111,7 +111,7 @@ class ServerController extends Controller
$server->delete();
return redirect()->route('servers.index')->with('success', 'server removed');
} catch (Exception $e) {
return redirect()->route('servers.index')->with('error', 'An exception has occurred while trying to remove a resource');
return redirect()->route('servers.index')->with('error', 'An exception has occurred while trying to remove a resource "' . $e->getMessage() . '"');
}
}

3
app/Models/Server.php
View file

@ -70,7 +70,8 @@ class Server extends Model
});
static::deleting(function (Server $server) {
Pterodactyl::client()->delete("/application/servers/{$server->pterodactyl_id}");
$response = Pterodactyl::client()->delete("/application/servers/{$server->pterodactyl_id}");
if ($response->failed()) throw new Exception($response['errors'][0]['code']);
});
}