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

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

View file

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

View file

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