banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-20 00:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Egg Variable Order (#1172)

Browse Source 
* Fix Egg Variable Order

* Fix Client Side Startup variable order
This commit is contained in:
Charles 2025-03-27 05:45:59 -04:00 committed by GitHub
parent c689f6860b
commit cb1c953540
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php
View File

@ -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() ->grid()
->mutateRelationshipDataBeforeSaveUsing(function (array &$data): array { ->mutateRelationshipDataBeforeSaveUsing(function (array &$data): array {

1
app/Models/Server.php
View File

@ -315,6 +315,7 @@ class Server extends Model implements Validatable
{ {
return $this->serverVariables() return $this->serverVariables()
->join('egg_variables', 'egg_variables.id', '=', 'server_variables.variable_id') ->join('egg_variables', 'egg_variables.id', '=', 'server_variables.variable_id')
->orderBy('egg_variables.sort')
->where('egg_variables.user_viewable', true); ->where('egg_variables.user_viewable', true);
} }