MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-12 19:33:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Include egg variables in the output from the API

Browse Source
This commit is contained in:
Dane Everitt
2020-08-22 15:43:28 -07:00
parent 3a2c60ce31
commit cae604e79d
12 changed files with 204 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/Server.php
View File

@@ -45,7 +45,7 @@ use Znck\Eloquent\Traits\BelongsToThrough;
* @property \Pterodactyl\Models\Node $node
* @property \Pterodactyl\Models\Nest $nest
* @property \Pterodactyl\Models\Egg $egg
* @property \Pterodactyl\Models\ServerVariable[]|\Illuminate\Database\Eloquent\Collection $variables
* @property \Pterodactyl\Models\EggVariable[]|\Illuminate\Database\Eloquent\Collection $variables
* @property \Pterodactyl\Models\Schedule[]|\Illuminate\Database\Eloquent\Collection $schedule
* @property \Pterodactyl\Models\Database[]|\Illuminate\Database\Eloquent\Collection $databases
* @property \Pterodactyl\Models\Location $location
@@ -270,7 +270,9 @@ class Server extends Model
*/
public function variables()
{
return $this->hasMany(ServerVariable::class);
return $this->hasMany(EggVariable::class, 'egg_id', 'egg_id')
->select(['egg_variables.*', 'server_variables.variable_value as server_value'])
->leftJoin('server_variables', 'server_variables.variable_id', '=', 'egg_variables.id');
}
/**