tiennm99/coolify
1
0 Fork 0
mirror of https://github.com/tiennm99/coolify.git synced 2026-10-15 02:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into allow-dep

Browse Source
This commit is contained in:
Andras Bacsai authored and GitHub committed 2025-10-03 11:52:58 +02:00
2 parents 41a8ea870f e17fbd3b56
commit 9107fb2af5
10 files changed
+221 -85
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Models/Application.php
+6 -6
View File
@@ -739,9 +739,9 @@ class Application extends BaseModel
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
->where('is_preview', false)
->orderByRaw("
CASE
WHEN LOWER(key) LIKE 'service_%' THEN 1
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
CASE
WHEN is_required = true THEN 1
WHEN LOWER(key) LIKE 'service_%' THEN 2
ELSE 3
END,
LOWER(key) ASC
@@ -767,9 +767,9 @@ class Application extends BaseModel
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
->where('is_preview', true)
->orderByRaw("
CASE
WHEN LOWER(key) LIKE 'service_%' THEN 1
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
CASE
WHEN is_required = true THEN 1
WHEN LOWER(key) LIKE 'service_%' THEN 2
ELSE 3
END,
LOWER(key) ASC
app/Models/Service.php
+3 -3
View File
@@ -1231,9 +1231,9 @@ class Service extends BaseModel
{
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
->orderByRaw("
CASE
WHEN LOWER(key) LIKE 'service_%' THEN 1
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
CASE
WHEN is_required = true THEN 1
WHEN LOWER(key) LIKE 'service_%' THEN 2
ELSE 3
END,
LOWER(key) ASC