banquise/pelican-panel-banquise
7
0
Fork 0
forked from banquise/pelican-panel-mirror
Code Pull Requests Activity

Fix relationship

Browse Source
This commit is contained in:
Lance Pioch 2024-06-02 00:33:58 -04:00
parent 04a1ccc97e
commit 110cc1248b
3 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,6 @@ use Illuminate\Http\Response;
use App\Models\Mount; use App\Models\Mount;
use App\Models\Server; use App\Models\Server;
use App\Models\Database; use App\Models\Database;
use App\Models\MountServer;
use Illuminate\Http\RedirectResponse; use Illuminate\Http\RedirectResponse;
use Prologue\Alerts\AlertsMessageBag; use Prologue\Alerts\AlertsMessageBag;
use App\Exceptions\DisplayException; use App\Exceptions\DisplayException;
@ -228,12 +227,7 @@ class ServersController extends Controller
*/ */
public function addMount(Request $request, Server $server): RedirectResponse public function addMount(Request $request, Server $server): RedirectResponse
{ {
$mountServer = (new MountServer())->forceFill([ $server->mounts()->attach($request->input('mount_id'));
'mount_id' => $request->input('mount_id'),
'server_id' => $server->id,
]);
$mountServer->saveOrFail();
$this->alert->success('Mount was added successfully.')->flash(); $this->alert->success('Mount was added successfully.')->flash();
@ -245,7 +239,7 @@ class ServersController extends Controller
*/ */
public function deleteMount(Server $server, Mount $mount): RedirectResponse public function deleteMount(Server $server, Mount $mount): RedirectResponse
{ {
MountServer::where('mount_id', $mount->id)->where('server_id', $server->id)->delete(); $server->mounts()->detach($mount);
$this->alert->success('Mount was removed successfully.')->flash(); $this->alert->success('Mount was removed successfully.')->flash();

16
app/Models/MountServer.php
View File

@ -1,16 +0,0 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class MountServer extends Model
{
protected $table = 'mount_server';
public $timestamps = false;
protected $primaryKey = null;
public $incrementing = false;
}

9
app/Models/Server.php
View File

@ -5,6 +5,7 @@ namespace App\Models;
use App\Enums\ServerState; use App\Enums\ServerState;
use App\Exceptions\Http\Connection\DaemonConnectionException; use App\Exceptions\Http\Connection\DaemonConnectionException;
use GuzzleHttp\Exception\GuzzleException; use GuzzleHttp\Exception\GuzzleException;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Notifications\Notifiable; use Illuminate\Notifications\Notifiable;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
@ -13,7 +14,6 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphToMany; use Illuminate\Database\Eloquent\Relations\MorphToMany;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use App\Exceptions\Http\Server\ServerStateConflictException; use App\Exceptions\Http\Server\ServerStateConflictException;
/** /**
@ -311,12 +311,9 @@ class Server extends Model
return $this->hasMany(Backup::class); return $this->hasMany(Backup::class);
} }
/** public function mounts(): BelongsToMany
* Returns all mounts that have this server has mounted.
*/
public function mounts(): HasManyThrough
{ {
return $this->hasManyThrough(Mount::class, MountServer::class, 'server_id', 'id', 'id', 'mount_id'); return $this->belongsToMany(Mount::class);
} }
/** /**