Revert "Less obtuse mounting code"

This reverts commit 9d95c5ab32.
This commit is contained in:
Dane Everitt 2020-08-25 21:54:41 -07:00
parent 0e0b58ba5e
commit ac1559de5e
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 23 additions and 89 deletions

View file

@ -2,9 +2,6 @@
namespace Pterodactyl\Models;
use MountNode;
use MountServer;
/**
* @property int $id
* @property string $uuid
@ -48,6 +45,11 @@ class Mount extends Model
*/
protected $attributes = [
'id' => 'int',
'uuid' => 'string',
'name' => 'string',
'description' => 'string',
'source' => 'string',
'target' => 'string',
'read_only' => 'bool',
'user_mountable' => 'bool',
];
@ -87,18 +89,20 @@ class Mount extends Model
/**
* Returns all nodes that have this mount assigned.
*
* @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function nodes()
{
return $this->hasManyThrough(Server::class, MountNode::class);
return $this->belongsToMany(Node::class);
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
* Returns all servers that have this mount assigned.
*
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function servers()
{
return $this->hasManyThrough(Server::class, MountServer::class);
return $this->belongsToMany(Server::class);
}
}

View file

@ -1,39 +0,0 @@
<?php
use Pterodactyl\Models\Node;
use Pterodactyl\Models\Mount;
use Illuminate\Database\Eloquent\Model;
class MountNode extends Model
{
/**
* @var bool
*/
public $timestamps = false;
/**
* @var bool
*/
public $incrementing = false;
/**
* @var string
*/
protected $table = 'mount_node';
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function node()
{
return $this->belongsTo(Node::class);
}
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function mount()
{
return $this->belongsTo(Mount::class);
}
}

View file

@ -1,39 +0,0 @@
<?php
use Pterodactyl\Models\Mount;
use Pterodactyl\Models\Server;
use Illuminate\Database\Eloquent\Model;
class MountServer extends Model
{
/**
* @var bool
*/
public $timestamps = false;
/**
* @var bool
*/
public $incrementing = false;
/**
* @var string
*/
protected $table = 'mount_server';
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function server()
{
return $this->belongsTo(Server::class);
}
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function mount()
{
return $this->belongsTo(Mount::class);
}
}