Fix access control in Admin Index and hide Admin link in navbar

This commit is contained in:
Andras Bacsai 2024-02-08 13:54:16 +01:00
parent 59c3cc6ce1
commit 9350fb4b97
2 changed files with 3 additions and 3 deletions

View File

@ -11,7 +11,7 @@ class Index extends Component
public $users = []; public $users = [];
public function mount() public function mount()
{ {
if (!isInstanceAdmin()) { if (auth()->user()->id !== 0) {
return redirect()->route('dashboard'); return redirect()->route('dashboard');
} }
$this->users = User::whereHas('teams', function ($query) { $this->users = User::whereHas('teams', function ($query) {

View File

@ -142,7 +142,7 @@ class="{{ request()->is('settings*') ? 'text-warning icon' : 'icon' }}"
</ul> </ul>
</details> </details>
@if (isCloud() && isInstanceAdmin()) {{-- @if (isCloud() && isInstanceAdmin())
<li title="Admin"> <li title="Admin">
<a class="hover:bg-transparent" href="/admin"> <a class="hover:bg-transparent" href="/admin">
<svg class="text-pink-600 icon" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg"> <svg class="text-pink-600 icon" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
@ -151,7 +151,7 @@ class="{{ request()->is('settings*') ? 'text-warning icon' : 'icon' }}"
</svg> </svg>
</a> </a>
</li> </li>
@endif @endif --}}
<div class="flex-1"></div> <div class="flex-1"></div>
@if (isInstanceAdmin() && !isCloud()) @if (isInstanceAdmin() && !isCloud())
@persist('upgrade') @persist('upgrade')