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

updates

Browse Source
This commit is contained in:
Andras Bacsai
2023-06-08 11:43:14 +02:00
parent 9767ca47ff
commit 127d42d873
12 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Controller.php
View File

@@ -31,7 +31,7 @@ class Controller extends BaseController
}
public function settings()
{
if (auth()->user()->isAdmin()) {
if (auth()->user()->isInstanceAdmin()) {
$settings = InstanceSettings::get();
return view('settings.configuration', [
'settings' => $settings
@@ -42,7 +42,7 @@ class Controller extends BaseController
}
public function emails()
{
if (auth()->user()->isAdmin()) {
if (auth()->user()->isInstanceAdmin()) {
$settings = InstanceSettings::get();
return view('settings.emails', [
'settings' => $settings

6
app/Http/Livewire/Team/Member.php
View File

@@ -8,8 +8,10 @@ use Livewire\Component;
class Member extends Component
{
public User $member;
public function render()
public function remove()
{
return view('livewire.team.member');
$this->member->teams()->detach(session('currentTeam'));
session(['currentTeam' => session('currentTeam')->fresh()]);
$this->emit('reloadWindow');
}
}

13
app/Models/User.php
View File

@@ -35,6 +35,11 @@ class User extends Authenticatable
});
}
public function isAdmin()
{
ray(session('currentTeam'));
return session('currentTeam');
}
public function isInstanceAdmin()
{
$found_root_team = auth()->user()->teams->filter(function ($team) {
if ($team->id == 0) {
@@ -49,10 +54,10 @@ class User extends Authenticatable
return $this->belongsToMany(Team::class);
}
public function currentTeam()
{
return $this->belongsTo(Team::class);
}
// public function currentTeam()
// {
// return $this->belongsTo(Team::class);
// }
public function otherTeams()
{