Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Browse source
This commit is contained in:
Dane Everitt 2020-02-08 15:23:11 -08:00
commit 1b1c95d8ce
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Console/Commands/Server/BulkPowerActionCommand.php
View file

@ -91,7 +91,7 @@ class BulkPowerActionCommand extends Command
} }
$count = $this->repository->getServersForPowerActionCount($servers, $nodes); $count = $this->repository->getServersForPowerActionCount($servers, $nodes);
if (! $this->confirm(trans('command/messages.server.power.confirm', ['action' => $action, 'count' => $count]))) { if (! $this->confirm(trans('command/messages.server.power.confirm', ['action' => $action, 'count' => $count])) && $this->input->isInteractive()) {
return; return;
} }

2
app/Console/Commands/Server/BulkReinstallActionCommand.php
View file

@ -71,7 +71,7 @@ class BulkReinstallActionCommand extends Command
{ {
$servers = $this->getServersToProcess(); $servers = $this->getServersToProcess();
if (! $this->confirm(trans('command/messages.server.reinstall.confirm'))) { if (! $this->confirm(trans('command/messages.server.reinstall.confirm')) && $this->input->isInteractive()) {
return; return;
} }