From cb1c9535408484eb17079c42e78310a179999f87 Mon Sep 17 00:00:00 2001 From: Charles Date: Thu, 27 Mar 2025 05:45:59 -0400 Subject: [PATCH] Fix Egg Variable Order (#1172) * Fix Egg Variable Order * Fix Client Side Startup variable order --- .../Admin/Resources/ServerResource/Pages/EditServer.php | 4 +++- app/Models/Server.php | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php b/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php index 8b0aed65f..8e7eb66a1 100644 --- a/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php +++ b/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php @@ -594,7 +594,9 @@ class EditServer extends EditRecord ]); } - return $query; + return $query + ->join('egg_variables', 'server_variables.variable_id', '=', 'egg_variables.id') + ->orderBy('egg_variables.sort'); }) ->grid() ->mutateRelationshipDataBeforeSaveUsing(function (array &$data): array { diff --git a/app/Models/Server.php b/app/Models/Server.php index c405987c3..f93131556 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -315,6 +315,7 @@ class Server extends Model implements Validatable { return $this->serverVariables() ->join('egg_variables', 'egg_variables.id', '=', 'server_variables.variable_id') + ->orderBy('egg_variables.sort') ->where('egg_variables.user_viewable', true); }