cupcakearmy/coolify
1
0
Fork 0
mirror of https://github.com/cupcakearmy/coolify.git synced 2024-10-22 16:14:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: team error

Browse Source
This commit is contained in:
Andras Bacsai 2023-09-15 17:30:26 +02:00
parent e17ff99c5b
commit 4b2ffb456f
7 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Livewire/Notifications/DiscordSettings.php
View File

@ -46,6 +46,7 @@ public function submit()
public function saveModel()
{
$this->team->save();
refreshSession();
$this->emit('success', 'Settings saved.');
}

5
app/Http/Livewire/Notifications/EmailSettings.php
View File

@ -62,6 +62,7 @@ public function submitFromFields()
'team.smtp_from_name' => 'required',
]);
$this->team->save();
refreshSession();
$this->emit('success', 'Settings saved successfully.');
} catch (\Throwable $e) {
return handleError($e, $this);
@ -81,6 +82,7 @@ public function instantSaveInstance()
$this->team->smtp_enabled = false;
$this->team->resend_enabled = false;
$this->team->save();
refreshSession();
$this->emit('success', 'Settings saved successfully.');
} catch (\Throwable $e) {
return handleError($e, $this);
@ -110,6 +112,7 @@ public function instantSave()
public function saveModel()
{
$this->team->save();
refreshSession();
$this->emit('success', 'Settings saved.');
}
public function submit()
@ -127,6 +130,7 @@ public function submit()
'team.smtp_timeout' => 'nullable',
]);
$this->team->save();
refreshSession();
$this->emit('success', 'Settings saved successfully.');
} catch (\Throwable $e) {
$this->team->smtp_enabled = false;
@ -143,6 +147,7 @@ public function submitResend()
'team.resend_api_key' => 'required'
]);
$this->team->save();
refreshSession();
$this->emit('success', 'Settings saved successfully.');
} catch (\Throwable $e) {
$this->team->resend_enabled = false;

1
app/Http/Livewire/Notifications/TelegramSettings.php
View File

@ -52,6 +52,7 @@ public function submit()
public function saveModel()
{
$this->team->save();
refreshSession();
$this->emit('success', 'Settings saved.');
}

1
app/Http/Livewire/Team/Form.php
View File

@ -27,6 +27,7 @@ public function submit()
$this->validate();
try {
$this->team->save();
refreshSession();
} catch (\Throwable $e) {
return handleError($e, $this);
}

6
app/Models/Team.php
View File

@ -21,9 +21,9 @@ class Team extends Model implements SendsDiscord, SendsEmail
protected static function booted()
{
static::saved(function () {
refreshSession();
});
// static::saved(function () {
// refreshSession();
// });
}
public function routeNotificationForDiscord()

2
bootstrap/helpers/shared.php
View File

@ -62,7 +62,7 @@ function showBoarding(): bool
function refreshSession(?Team $team = null): void
{
if (!$team) {
if (auth()->user()->currentTeam()) {
if (auth()->user()?->currentTeam()) {
$team = Team::find(auth()->user()->currentTeam()->id);
} else {
$team = User::find(auth()->user()->id)->teams->first();

2
versions.json
View File

@ -4,7 +4,7 @@
"version": "3.12.36"
},
"v4": {
"version": "4.0.0-beta.38"
"version": "4.0.0-beta.33"
}
}
}