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

Merge pull request #2497 from pterodactyl/fix/server-mounts

Browse source 
Fix server mounts
This commit is contained in:
Dane Everitt 2020-10-12 20:13:35 -07:00 committed by GitHub
commit 289de72aca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,7 @@ use Illuminate\Http\Request;
use Pterodactyl\Models\User; use Pterodactyl\Models\User;
use Pterodactyl\Models\Mount; use Pterodactyl\Models\Mount;
use Pterodactyl\Models\Server; use Pterodactyl\Models\Server;
use Pterodactyl\Models\MountServer;
use Prologue\Alerts\AlertsMessageBag; use Prologue\Alerts\AlertsMessageBag;
use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Exception\RequestException;
use Pterodactyl\Exceptions\DisplayException; use Pterodactyl\Exceptions\DisplayException;
@ -419,17 +420,16 @@ class ServersController extends Controller
* *
* @param Server $server * @param Server $server
* @param \Pterodactyl\Models\Mount $mount * @param \Pterodactyl\Models\Mount $mount
* @return \Illuminate\Http\RedirectResponse
* *
* @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException * @return \Illuminate\Http\RedirectResponse
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException|\Throwable
*/ */
public function addMount(Server $server, Mount $mount) public function addMount(Server $server, Mount $mount)
{ {
$server->mounts()->updateOrCreate([ $mountServer = new MountServer;
'mount_id' => $mount->id, $mountServer->mount_id = $mount->id;
'server_id' => $server->id, $mountServer->server_id = $server->id;
]); $mountServer->saveOrFail();
$data = $this->serverConfigurationStructureService->handle($server); $data = $this->serverConfigurationStructureService->handle($server);
@ -458,10 +458,7 @@ class ServersController extends Controller
*/ */
public function deleteMount(Server $server, Mount $mount) public function deleteMount(Server $server, Mount $mount)
{ {
$server->mounts() MountServer::where('mount_id', $mount->id)->where('server_id', $server->id)->delete();
->where('mount_id', $mount->id)
->where('server_id', $server->id)
->delete();
$data = $this->serverConfigurationStructureService->handle($server); $data = $this->serverConfigurationStructureService->handle($server);

5
app/Models/MountServer.php
View file

@ -11,6 +11,11 @@ class MountServer extends Model
*/ */
protected $table = 'mount_server'; protected $table = 'mount_server';
/**
* @var bool
*/
public $timestamps = false;
/** /**
* @var null * @var null
*/ */