dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(core): improve instantSave logic and error handling

Browse Source
This commit is contained in:
Andras Bacsai
2025-03-15 22:26:59 +01:00
parent 798aab6955
commit 8a11de9b1a
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Livewire/SettingsEmail.php
View File

@@ -114,19 +114,24 @@ class SettingsEmail extends Component
public function instantSave(string $type) public function instantSave(string $type)
{ {
try { try {
$currentSmtpEnabled = $this->settings->smtp_enabled;
$currentResendEnabled = $this->settings->resend_enabled;
$this->resetErrorBag(); $this->resetErrorBag();
if ($type === 'SMTP') { if ($type === 'SMTP') {
$this->submitSmtp(); $this->submitSmtp();
$this->resendEnabled = $this->settings->resend_enabled = false;
} elseif ($type === 'Resend') { } elseif ($type === 'Resend') {
$this->submitResend(); $this->submitResend();
$this->smtpEnabled = $this->settings->smtp_enabled = false;
} }
$this->settings->save();
} catch (\Throwable $e) { } catch (\Throwable $e) {
if ($type === 'SMTP') { if ($type === 'SMTP') {
$this->smtpEnabled = false; $this->smtpEnabled = $currentSmtpEnabled;
} elseif ($type === 'Resend') { } elseif ($type === 'Resend') {
$this->resendEnabled = false; $this->resendEnabled = $currentResendEnabled;
} }
return handleError($e, $this); return handleError($e, $this);
@@ -156,9 +161,6 @@ class SettingsEmail extends Component
'smtpEncryption.required' => 'Encryption type is required.', 'smtpEncryption.required' => 'Encryption type is required.',
]); ]);
$this->resendEnabled = false;
$this->settings->resend_enabled = false;
$this->settings->smtp_enabled = $this->smtpEnabled; $this->settings->smtp_enabled = $this->smtpEnabled;
$this->settings->smtp_host = $this->smtpHost; $this->settings->smtp_host = $this->smtpHost;
$this->settings->smtp_port = $this->smtpPort; $this->settings->smtp_port = $this->smtpPort;
@@ -194,9 +196,6 @@ class SettingsEmail extends Component
'smtpFromName.required' => 'From Name is required.', 'smtpFromName.required' => 'From Name is required.',
]); ]);
$this->smtpEnabled = false;
$this->settings->smtp_enabled = false;
$this->settings->resend_enabled = $this->resendEnabled; $this->settings->resend_enabled = $this->resendEnabled;
$this->settings->resend_api_key = $this->resendApiKey; $this->settings->resend_api_key = $this->resendApiKey;
$this->settings->smtp_from_address = $this->smtpFromAddress; $this->settings->smtp_from_address = $this->smtpFromAddress;