banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-20 14:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hide Startup + Show Activity on Server panel when in conflictState (#850)

Browse Source 
* Hide startup if isInConflictState

* Show ActivityLog regardless of isInConflictState

* Update app/Filament/Server/Pages/Startup.php

Co-authored-by: Boy132 <Boy132@users.noreply.github.com>

---------

Co-authored-by: Boy132 <Boy132@users.noreply.github.com>
This commit is contained in:
MartinOscar 2024-12-31 14:19:18 +01:00 committed by GitHub
parent b5733715a6
commit 00ae3b8b61
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Filament/Server/Pages/Startup.php
View File

@ -153,7 +153,7 @@ class Startup extends ServerFormPage
public static function canAccess(): bool public static function canAccess(): bool
{ {
return auth()->user()->can(Permission::ACTION_STARTUP_READ, Filament::getTenant()); return parent::canAccess() && auth()->user()->can(Permission::ACTION_STARTUP_READ, Filament::getTenant());
} }
private function shouldHideComponent(ServerVariable $serverVariable, Component $component): bool private function shouldHideComponent(ServerVariable $serverVariable, Component $component): bool

13
app/Filament/Server/Resources/ActivityResource.php
View File

@ -52,19 +52,6 @@ class ActivityResource extends Resource
}); });
} }
// TODO: find better way handle server conflict state
public static function canAccess(): bool
{
/** @var Server $server */
$server = Filament::getTenant();
if ($server->isInConflictState()) {
return false;
}
return parent::canAccess();
}
public static function canViewAny(): bool public static function canViewAny(): bool
{ {
return auth()->user()->can(Permission::ACTION_ACTIVITY_READ, Filament::getTenant()); return auth()->user()->can(Permission::ACTION_ACTIVITY_READ, Filament::getTenant());