From 42a5cef684814464792b55527d3cd86dc134c8c6 Mon Sep 17 00:00:00 2001 From: Matt Young Date: Sat, 2 Nov 2024 12:31:41 -0500 Subject: [PATCH] Allow the user to choose how many entries per page on the entry admin screen. --- app/Http/Controllers/Admin/EntryController.php | 7 ++++++- app/Http/Controllers/FilterController.php | 1 + resources/views/admin/entries/index.blade.php | 12 ++++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Admin/EntryController.php b/app/Http/Controllers/Admin/EntryController.php index 328fc35..37ae633 100644 --- a/app/Http/Controllers/Admin/EntryController.php +++ b/app/Http/Controllers/Admin/EntryController.php @@ -28,6 +28,7 @@ class EntryController extends Controller if (! Auth::user()->is_admin) { abort(403); } + $perPage = 25; $filters = session('adminEntryFilters') ?? null; $minGrade = Audition::min('minimum_grade'); $maxGrade = Audition::max('maximum_grade'); @@ -79,9 +80,13 @@ class EntryController extends Controller }; } + if ($filters['entries_per_page']) { + $perPage = $filters['entries_per_page']; + } + } - $entries = $entries->paginate(10000); + $entries = $entries->paginate($perPage); return view('admin.entries.index', [ 'entries' => $entries, diff --git a/app/Http/Controllers/FilterController.php b/app/Http/Controllers/FilterController.php index 6bd829e..84e7a4e 100644 --- a/app/Http/Controllers/FilterController.php +++ b/app/Http/Controllers/FilterController.php @@ -16,6 +16,7 @@ class FilterController extends Controller $filters['first_name'] = request('first_name_filter') ? request('first_name_filter') : null; $filters['last_name'] = request('last_name_filter') ? request('last_name_filter') : null; $filters['entry_type'] = request('entry_type_filter') ? request('entry_type_filter') : null; + $filters['entries_per_page'] = request('entries_per_page_filter') ? request('entries_per_page_filter') : null; session(['adminEntryFilters' => $filters]); diff --git a/resources/views/admin/entries/index.blade.php b/resources/views/admin/entries/index.blade.php index 8ec95b0..710f1c1 100644 --- a/resources/views/admin/entries/index.blade.php +++ b/resources/views/admin/entries/index.blade.php @@ -36,8 +36,8 @@ @php($n++); @endwhile - - + + @if(auditionSetting('advanceTo')) Entry Type @@ -48,6 +48,14 @@ @endif + + Entries Per Page + + + + + + Clear Filters