StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add delete server support as well as fix a few other bugs

Browse source 
Also a few JS fixes to make things work better and not clear the
console every time the server is booted
This commit is contained in:
Dane Everitt 2016-01-03 23:16:03 -05:00
parent 9d2d726992
commit 4fe4881f77
7 changed files with 167 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/Http/Controllers/Admin/ServersController.php
View file

@ -65,6 +65,10 @@ class ServersController extends Controller
->where('servers.id', $id)
->first();
if (!$server) {
return abort(404);
}
return view('admin.servers.view', [
'server' => $server,
'assigned' => Models\Allocation::select('id', 'ip', 'port')->where('assigned_to', $id)->orderBy('ip', 'asc')->orderBy('port', 'asc')->get(),
@ -289,4 +293,23 @@ class ServersController extends Controller
]);
}
public function deleteServer(Request $request, $id, $force = null)
{
try {
$server = new ServerRepository;
$server->deleteServer($id, $force);
Alert::success('Server was successfully deleted from the panel and the daemon.')->flash();
return redirect()->route('admin.servers');
} catch (\Pterodactyl\Exceptions\DisplayException $e) {
Alert::danger($e->getMessage())->flash();
} catch(\Exception $e) {
Log::error($e);
Alert::danger('An unhandled exception occured while attemping to add this server. Please try again.')->flash();
}
return redirect()->route('admin.servers.view', [
'id' => $id,
'tab' => 'tab_delete'
]);
}
}

1
app/Http/Routes/AdminRoutes.php
View file

@ -33,6 +33,7 @@ class AdminRoutes {
$router->post('/view/{id}/details', [ 'uses' => 'Admin\ServersController@postUpdateServerDetails' ]);
$router->post('/view/{id}/rebuild', [ 'uses' => 'Admin\ServersController@postUpdateServerToggleBuild' ]);
$router->post('/view/{id}/build', [ 'uses' => 'Admin\ServersController@postUpdateServerUpdateBuild' ]);
$router->delete('/view/{id}/{force?}', [ 'uses' => 'Admin\ServersController@deleteServer' ]);
$router->post('/new', [ 'uses' => 'Admin\ServersController@postNewServer']);
$router->post('/new/get-nodes', [ 'uses' => 'Admin\ServersController@postNewServerGetNodes' ]);