From 6ef93c75b803f8204fc72d5db80a91f284528996 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Mon, 19 May 2025 15:10:11 +0200 Subject: [PATCH] put `whereHas`-`orDoesntHave` in own `where` --- app/Filament/Admin/Resources/DatabaseHostResource.php | 8 +++++--- app/Filament/Admin/Resources/MountResource.php | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/Filament/Admin/Resources/DatabaseHostResource.php b/app/Filament/Admin/Resources/DatabaseHostResource.php index 0b6fb29b5..084e1f72a 100644 --- a/app/Filament/Admin/Resources/DatabaseHostResource.php +++ b/app/Filament/Admin/Resources/DatabaseHostResource.php @@ -164,8 +164,10 @@ class DatabaseHostResource extends Resource { $query = parent::getEloquentQuery(); - return $query->whereHas('nodes', function (Builder $query) { - $query->whereIn('nodes.id', auth()->user()->accessibleNodes()->pluck('id')); - })->orDoesntHave('nodes'); + return $query->where(function (Builder $query) { + return $query->whereHas('nodes', function (Builder $query) { + $query->whereIn('nodes.id', auth()->user()->accessibleNodes()->pluck('id')); + })->orDoesntHave('nodes'); + }); } } diff --git a/app/Filament/Admin/Resources/MountResource.php b/app/Filament/Admin/Resources/MountResource.php index 7336cb741..ea1a8ebf3 100644 --- a/app/Filament/Admin/Resources/MountResource.php +++ b/app/Filament/Admin/Resources/MountResource.php @@ -176,8 +176,10 @@ class MountResource extends Resource { $query = parent::getEloquentQuery(); - return $query->whereHas('nodes', function (Builder $query) { - $query->whereIn('nodes.id', auth()->user()->accessibleNodes()->pluck('id')); - })->orDoesntHave('nodes'); + return $query->where(function (Builder $query) { + return $query->whereHas('nodes', function (Builder $query) { + $query->whereIn('nodes.id', auth()->user()->accessibleNodes()->pluck('id')); + })->orDoesntHave('nodes'); + }); } }