StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update logic for tracking a server's transfer state

Browse source
This commit is contained in:
Matthew Penner 2020-12-16 09:34:47 -07:00
parent 5d03c0d2e5
commit e6c4a68e4a
20 changed files with 206 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Models/Server.php
View file

@ -306,7 +306,7 @@ class Server extends Model
*/
public function transfer()
{
return $this->hasOne(ServerTransfer::class)->orderByDesc('id');
return $this->hasOne(ServerTransfer::class)->whereNull('successful')->orderByDesc('id');
}
/**

4
app/Models/ServerTransfer.php
View file

@ -11,7 +11,7 @@ namespace Pterodactyl\Models;
* @property int $new_allocation
* @property string $old_additional_allocations
* @property string $new_additional_allocations
* @property bool $successful
* @property bool|null $successful
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
*
@ -66,7 +66,7 @@ class ServerTransfer extends Model
'new_allocation' => 'required|numeric',
'old_additional_allocations' => 'nullable',
'new_additional_allocations' => 'nullable',
'successful' => 'sometimes|boolean',
'successful' => 'sometimes|nullable|boolean',
];
/**