banquise/pelican-panel-mirror
13
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-10-29 23:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use tenantMiddleware instead of manually fetching tenant query param (#1799)

Browse Source
This commit is contained in:
MartinOscar 2025-10-12 18:07:10 +02:00 committed by GitHub
parent e589f972fb
commit 317fa46894
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Middleware/Activity/ServerSubject.php
View File

@ -5,6 +5,7 @@ namespace App\Http\Middleware\Activity;
use App\Facades\LogTarget; use App\Facades\LogTarget;
use App\Models\Server; use App\Models\Server;
use Closure; use Closure;
use Filament\Facades\Filament;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
@ -21,10 +22,7 @@ class ServerSubject
public function handle(Request $request, Closure $next): Response public function handle(Request $request, Closure $next): Response
{ {
$server = $request->route()->parameter('server'); $server = $request->route()->parameter('server');
$server ??= Filament::getTenant();
if ($request->route()->hasParameter('tenant')) {
$server = Server::find($request->route()->parameter('tenant'));
}
if ($server instanceof Server) { if ($server instanceof Server) {
LogTarget::setActor($request->user()); LogTarget::setActor($request->user());

2
app/Providers/Filament/ServerPanelProvider.php
View File

@ -41,7 +41,7 @@ class ServerPanelProvider extends PanelProvider
->discoverResources(in: app_path('Filament/Server/Resources'), for: 'App\\Filament\\Server\\Resources') ->discoverResources(in: app_path('Filament/Server/Resources'), for: 'App\\Filament\\Server\\Resources')
->discoverPages(in: app_path('Filament/Server/Pages'), for: 'App\\Filament\\Server\\Pages') ->discoverPages(in: app_path('Filament/Server/Pages'), for: 'App\\Filament\\Server\\Pages')
->discoverWidgets(in: app_path('Filament/Server/Widgets'), for: 'App\\Filament\\Server\\Widgets') ->discoverWidgets(in: app_path('Filament/Server/Widgets'), for: 'App\\Filament\\Server\\Widgets')
->middleware([ ->tenantMiddleware([
ServerSubject::class, ServerSubject::class,
]); ]);
} }