Merge pull request #1938 from coollabsio/next

v4.0.0-beta.251
This commit is contained in:
Andras Bacsai 2024-04-05 18:50:18 +02:00 committed by GitHub
commit aa2ac3865c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 10 additions and 4 deletions

View File

@ -15,6 +15,9 @@ class Index extends Component
if (!isCloud()) { if (!isCloud()) {
return redirect(RouteServiceProvider::HOME); return redirect(RouteServiceProvider::HOME);
} }
if (auth()->user()?->isMember()) {
return redirect()->route('dashboard');
}
if (data_get(currentTeam(), 'subscription') && isSubscriptionActive()) { if (data_get(currentTeam(), 'subscription') && isSubscriptionActive()) {
return redirect()->route('subscription.show'); return redirect()->route('subscription.show');
} }

View File

@ -11,6 +11,9 @@ class Show extends Component
if (!isCloud()) { if (!isCloud()) {
return redirect()->route('dashboard'); return redirect()->route('dashboard');
} }
if (auth()->user()?->isMember()) {
return redirect()->route('dashboard');
}
if (!data_get(currentTeam(), 'subscription')) { if (!data_get(currentTeam(), 'subscription')) {
return redirect()->route('subscription.index'); return redirect()->route('subscription.index');
} }

View File

@ -22,7 +22,7 @@ class Team extends Model implements SendsDiscord, SendsEmail
protected static function booted() protected static function booted()
{ {
static::saving(function ($team) { static::saving(function ($team) {
if (auth()->user()->isMember()) { if (auth()->user()?->isMember()) {
throw new \Exception('You are not allowed to update this team.'); throw new \Exception('You are not allowed to update this team.');
} }
}); });

View File

@ -7,7 +7,7 @@ return [
// The release version of your application // The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.250', 'release' => '4.0.0-beta.251',
// When left empty or `null` the Laravel environment will be used // When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'), 'environment' => config('app.env'),

View File

@ -1,3 +1,3 @@
<?php <?php
return '4.0.0-beta.250'; return '4.0.0-beta.251';

View File

@ -1,7 +1,7 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.250" "version": "4.0.0-beta.251"
} }
} }
} }