Bugfixes

- Livewire select user dropdown hidden input form validation - Don't show clapters wth clips without assets in series page Signed-off-by: Stefanos Georgopoulos <[email protected]>
rrze-mmz · Feb 3, 2025 · 69ae224 · 69ae224
1 parent 7ada169
commit 69ae224
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 72 deletions.
diff --git a/app/Livewire/ListSeriesClips.php b/app/Livewire/ListSeriesClips.php
@@ -55,6 +55,7 @@ public function render(): Application|Factory|View|\Illuminate\View\View
         $search = trim(Str::lower($this->search));
         $series = $this->series;
         $clips = $this->queryClips($search)->get();
+
         $chapterIDs = $clips->pluck('chapter_id')
             ->unique()
             ->reject(function ($value) {
@@ -105,10 +106,11 @@ protected function queryClips($search)
         if (! auth()->check() || auth()->user()->cannot('edit-series', $this->series)) {
             $query->Public()
                 ->where(function (Builder $query) {
-                    $query->has('assets')
-                        ->orWhere('recording_date', '<', Carbon::yesterday())
-                        ->orWhere('is_livestream', true);
+                    $query->whereHas('assets') // Must have assets
+                        ->orwhere('recording_date', '<', Carbon::yesterday())
+                        ->orWhere('is_livestream', true); // Both conditions required
                 });
+
         }
 
         return $this->applySearchFilter($query, $search)->orderBy('episode', 'asc');