mirror of
https://github.com/coollabsio/coolify.git
synced 2026-11-04 10:42:23 +00:00
Reapply "Merge branch 'next' into main"
This reverts commit 7bbd91175f.
This commit is contained in:
1 parent
7bbd91175f
commit
ca5fcce39b
139 files changed
+5343
-865
No files matched your search
@@ -161,6 +161,22 @@ class Show extends Component
|
||||
$this->valuesLoaded = true;
|
||||
}
|
||||
|
||||
public function copyValue(): ?string
|
||||
{
|
||||
if ($this->env->is_shown_once || (auth()->user()?->isMember() ?? true)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (! $this->env instanceof ModelsEnvironmentVariable) {
|
||||
return $this->env->value;
|
||||
}
|
||||
|
||||
return $this->env->get_real_environment_variables_with_server(
|
||||
$this->env->resolveReferencedValue(),
|
||||
$this->env->resourceable,
|
||||
);
|
||||
}
|
||||
|
||||
public function syncData(bool $toModel = false)
|
||||
{
|
||||
if ($toModel) {
|
||||
@@ -204,7 +220,7 @@ class Show extends Component
|
||||
$this->is_required = (bool) ($this->env->is_required ?? false);
|
||||
// Use the stored column, not the value-based accessor (that decrypts).
|
||||
$this->is_shared = (bool) ($this->env->getAttributes()['is_shared'] ?? false);
|
||||
$this->isValueHidden = auth()->user()?->isMember() ?? false;
|
||||
$this->isValueHidden = auth()->user()?->isMember() ?? true;
|
||||
|
||||
if ($this->valuesLoaded) {
|
||||
$this->hydrateValueFields();
|
||||
@@ -231,12 +247,12 @@ class Show extends Component
|
||||
$this->is_really_required = $this->is_required && blank($this->value);
|
||||
}
|
||||
|
||||
if ($this->env->is_shown_once || auth()->user()?->isMember()) {
|
||||
if ($this->env->is_shown_once || (auth()->user()?->isMember() ?? true)) {
|
||||
$this->value = null;
|
||||
$this->real_value = null;
|
||||
}
|
||||
|
||||
$this->isValueHidden = auth()->user()?->isMember() ?? false;
|
||||
$this->isValueHidden = auth()->user()?->isMember() ?? true;
|
||||
}
|
||||
|
||||
public function checkEnvs()
|
||||
|
||||
Reference in new issue
Block a user