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

Push pack services and fix for failing tests

Browse source
This commit is contained in:
Dane Everitt 2017-08-20 19:23:50 -05:00
parent 280633b28a
commit cdfbc60030
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
21 changed files with 415 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/Http/Controllers/Admin/ServiceController.php
View file

@ -30,7 +30,6 @@ use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Services\Services\ServiceUpdateService;
use Pterodactyl\Services\Services\ServiceCreationService;
use Pterodactyl\Services\Services\ServiceDeletionService;
use Pterodactyl\Exceptions\Service\HasActiveServersException;
use Pterodactyl\Http\Requests\Admin\Service\ServiceFormRequest;
use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
use Pterodactyl\Http\Requests\Admin\Service\ServiceFunctionsFormRequest;
@ -179,17 +178,13 @@ class ServiceController extends Controller
*
* @param \Pterodactyl\Models\Service $service
* @return \Illuminate\Http\RedirectResponse
*
* @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
*/
public function destroy(Service $service)
{
try {
$this->deletionService->handle($service->id);
$this->alert->success(trans('admin/services.notices.service_deleted'))->flash();
} catch (HasActiveServersException $exception) {
$this->alert->danger($exception->getMessage())->flash();
return redirect()->back();
}
$this->deletionService->handle($service->id);
$this->alert->success(trans('admin/services.notices.service_deleted'))->flash();
return redirect()->route('admin.services');
}