From 3da39e240ffd1bb0cf53e20f70bdb67e1c885b98 Mon Sep 17 00:00:00 2001 From: HolgerHatGarKeineNode Date: Wed, 15 Mar 2023 15:39:19 +0100 Subject: [PATCH] filters corrected --- app/Http/Livewire/Library/LibraryTable.php | 4 ++++ app/Http/Livewire/Tables/LecturerTable.php | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Http/Livewire/Library/LibraryTable.php b/app/Http/Livewire/Library/LibraryTable.php index 2655c02e..6ec2bfa8 100644 --- a/app/Http/Livewire/Library/LibraryTable.php +++ b/app/Http/Livewire/Library/LibraryTable.php @@ -104,6 +104,10 @@ class LibraryTable extends Component ->where('libraries.name', $this->currentTab) ) ) + ->when(isset($this->filters['lecturer_id']), + fn($query) => $query->where('library_items.lecturer_id', + $this->filters['lecturer_id']) + ) ->when(isset($this->filters['tag']), fn($query) => $query->whereHas('tags', fn($query) => $query->whereIn('tags.id', $this->filters['tag']))) ->when(isset($this->filters['language']), diff --git a/app/Http/Livewire/Tables/LecturerTable.php b/app/Http/Livewire/Tables/LecturerTable.php index cf3eda8b..c8d8a097 100644 --- a/app/Http/Livewire/Tables/LecturerTable.php +++ b/app/Http/Livewire/Tables/LecturerTable.php @@ -85,7 +85,7 @@ class LecturerTable extends DataTableComponent return Lecturer::query() ->withCount([ 'courses', - 'libraryItems', + 'libraryItems' => fn($query) => $query->where('news', false) ]); } @@ -108,10 +108,8 @@ class LecturerTable extends DataTableComponent return to_route('library.table.libraryItems', [ '#table', 'country' => $this->country, - 'library_items' => [ - 'filters' => [ - 'lecturer_id' => $lecturer->id, - ], + 'filters' => [ + 'lecturer_id' => $lecturer->id, ], ]); }