tiennm99/coolify
1
0
Fork 0
mirror of https://github.com/tiennm99/coolify.git synced 2026-08-13 06:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into shadow/add-shared-server-env

Browse Source
This commit is contained in:
ShadowArcanist
2026-01-14 05:26:06 +01:00
committed by GitHub
parent 54c28710d9 cab2c9674a
commit e412b57df7
227 changed files with 9960 additions and 15827 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Livewire/Project/Shared/EnvironmentVariable/All.php
+16 -6
View File
@@ -63,20 +63,30 @@ class All extends Component
public function getEnvironmentVariablesProperty()
{
if ($this->is_env_sorting_enabled === false) {
return $this->resource->environment_variables()->orderBy('order')->get();
$query = $this->resource->environment_variables()
->orderByRaw("CASE WHEN is_required = true AND (value IS NULL OR value = '') THEN 0 ELSE 1 END");
if ($this->is_env_sorting_enabled) {
$query->orderBy('key');
} else {
$query->orderBy('order');
}
return $this->resource->environment_variables;
return $query->get();
}
public function getEnvironmentVariablesPreviewProperty()
{
if ($this->is_env_sorting_enabled === false) {
return $this->resource->environment_variables_preview()->orderBy('order')->get();
$query = $this->resource->environment_variables_preview()
->orderByRaw("CASE WHEN is_required = true AND (value IS NULL OR value = '') THEN 0 ELSE 1 END");
if ($this->is_env_sorting_enabled) {
$query->orderBy('key');
} else {
$query->orderBy('order');
}
return $this->resource->environment_variables_preview;
return $query->get();
}
public function getDevView()