mirror of
https://github.com/pelican-dev/panel.git
synced 2025-05-20 00:34:44 +02:00
Fix Egg Variable Order (#1172)
* Fix Egg Variable Order * Fix Client Side Startup variable order
This commit is contained in:
parent
c689f6860b
commit
cb1c953540
@ -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 {
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user