Fix 500 error when mounting a mount and fix the actual mount being deleted instead of the relation
This commit is contained in:
parent
d795668fc2
commit
abd60ee6f8
2 changed files with 16 additions and 9 deletions
|
@ -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,21 @@ 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([
|
/*$server->mounts()->updateOrCreate([
|
||||||
'mount_id' => $mount->id,
|
'mount_id' => $mount->id,
|
||||||
'server_id' => $server->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);
|
$data = $this->serverConfigurationStructureService->handle($server);
|
||||||
|
|
||||||
|
@ -458,10 +463,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);
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue