From 12242106683f215dd4d809f1cf0ebe8e8c00e162 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Tue, 20 May 2025 08:33:16 +0200 Subject: [PATCH] Only include "server" subjects in activity log query (#1386) --- app/Filament/Server/Resources/ActivityResource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Filament/Server/Resources/ActivityResource.php b/app/Filament/Server/Resources/ActivityResource.php index a69eedaf9..584e27cde 100644 --- a/app/Filament/Server/Resources/ActivityResource.php +++ b/app/Filament/Server/Resources/ActivityResource.php @@ -30,7 +30,7 @@ class ActivityResource extends Resource /** @var Server $server */ $server = Filament::getTenant(); - return ActivityLog::whereHas('subjects', fn (Builder $query) => $query->where('subject_id', $server->id)) + return ActivityLog::whereHas('subjects', fn (Builder $query) => $query->where('subject_id', $server->id)->where('subject_type', $server->getMorphClass())) ->whereNotIn('activity_logs.event', ActivityLog::DISABLED_EVENTS) ->when(config('activity.hide_admin_activity'), function (Builder $builder) use ($server) { // We could do this with a query and a lot of joins, but that gets pretty