MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-18 14:23:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove suspended & installing fields, replace with single status field

Browse Source
This commit is contained in:
Dane Everitt
2021-01-17 15:51:56 -08:00
parent 4c29be2e54
commit a75a347d65
24 changed files with 115 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/Servers/ServerViewController.php
View File

@@ -207,7 +207,7 @@ class ServerViewController extends Controller
*/
public function manage(Request $request, Server $server)
{
if ($server->installed > 1) {
if ($server->status === Server::STATUS_INSTALL_FAILED) {
throw new DisplayException(
'This server is in a failed install state and cannot be recovered. Please delete and re-create the server.'
);

4
app/Http/Controllers/Admin/ServersController.php
View File

@@ -228,12 +228,12 @@ class ServersController extends Controller
*/
public function toggleInstall(Server $server)
{
if ($server->installed > 1) {
if ($server->status === Server::STATUS_INSTALL_FAILED) {
throw new DisplayException(trans('admin/server.exceptions.marked_as_failed'));
}
$this->repository->update($server->id, [
'installed' => ! $server->installed,
'status' => $server->isInstalled() ? Server::STATUS_INSTALLING : null,
], true, true);
$this->alert->success(trans('admin/server.alerts.install_toggled'))->flash();