diff --git a/app/Http/Controllers/AlumnusController.php b/app/Http/Controllers/AlumnusController.php index cfca5d9..320b43a 100644 --- a/app/Http/Controllers/AlumnusController.php +++ b/app/Http/Controllers/AlumnusController.php @@ -100,9 +100,9 @@ public function searchAlumni(Request $request) $user = Auth::user(); if ($user && $user->can('create', Alumnus::class)) { $idsHavingDraftPairs = DB::table('alumni')->where('is_draft', false)->whereNotNull('pair_id')->pluck('id'); - $alumni = $query->whereNotIn('id', $idsHavingDraftPairs)->get(); + $alumni = $query->whereNotIn('id', $idsHavingDraftPairs)->paginate(10); } else { - $alumni = $query->where('is_draft', false)->get(); + $alumni = $query->where('is_draft', false)->paginate(10); } return view('alumni.index', [ diff --git a/resources/views/alumni/index.blade.php b/resources/views/alumni/index.blade.php index 0c35907..09f970f 100644 --- a/resources/views/alumni/index.blade.php +++ b/resources/views/alumni/index.blade.php @@ -159,7 +159,7 @@ @endforelse - @if(isset($alumni) && !empty($alumni) && !isset($search)) + @if(isset($alumni) && !empty($alumni))