From 4828cc6e8493680fc0bb82a241010efe0a9ebbc8 Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 1 Oct 2024 11:44:26 +1000 Subject: [PATCH] URL path to control number of listed items for duplicates/delete --- app/Http/Controllers/PhotoController.php | 10 ++++++---- app/Http/Controllers/VideoController.php | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/PhotoController.php b/app/Http/Controllers/PhotoController.php index 84345a2..1927028 100644 --- a/app/Http/Controllers/PhotoController.php +++ b/app/Http/Controllers/PhotoController.php @@ -2,6 +2,8 @@ namespace App\Http\Controllers; +use Illuminate\Http\Request; + use App\Models\Photo; use App\Traits\Multimedia; @@ -18,13 +20,13 @@ class PhotoController extends Controller ->action('PhotoController@info',[$o->id]); } - public function deletes($id=NULL) + public function deletes(Request $request,$id=NULL) { return view('catalog.deletereview',[ 'catalog'=>is_null($id) ? Photo::where('remove',1) ->with(['software.model.make']) - ->paginate(self::list_deletes) + ->paginate($request->input('list',self::list_deletes)) : Photo::where('id',$id) ->paginate(1), 'return'=>url('p/deletes'), @@ -32,13 +34,13 @@ class PhotoController extends Controller ]); } - public function duplicates($id=NULL) + public function duplicates(Request $request,$id=NULL) { return view('catalog.duplicatereview',[ 'catalog'=>is_null($id) ? Photo::duplicates() ->with(['software.model.make']) - ->paginate(self::list_duplicates) + ->paginate($request->input('list',self::list_duplicates)) : Photo::where('id',$id) ->paginate(1), 'return'=>url('p/duplicates'), diff --git a/app/Http/Controllers/VideoController.php b/app/Http/Controllers/VideoController.php index 502499e..63e51e4 100644 --- a/app/Http/Controllers/VideoController.php +++ b/app/Http/Controllers/VideoController.php @@ -2,6 +2,8 @@ namespace App\Http\Controllers; +use Illuminate\Http\Request; + use App\Models\Video; use App\Helpers\VideoStream; use App\Traits\Multimedia; @@ -19,13 +21,13 @@ class VideoController extends Controller ->action('VideoController@info',[$o->id]); } - public function deletes($id=NULL) + public function deletes(Request $request,$id=NULL) { return view('catalog.deletereview',[ 'catalog'=>is_null($id) ? Video::where('remove',1) ->with(['software.model.make']) - ->paginate(self::list_deletes) + ->paginate($request->input('list',self::list_deletes)) : Video::where('id',$id) ->paginate(1), 'return'=>url('v/deletes'), @@ -33,13 +35,13 @@ class VideoController extends Controller ]); } - public function duplicates($id=NULL) + public function duplicates(Request $request,$id=NULL) { return view('catalog.duplicatereview',[ 'catalog'=>is_null($id) ? Video::duplicates() ->with(['software.model.make']) - ->paginate(self::list_duplicates) + ->paginate($request->input('list',self::list_duplicates)) : Video::where('id',$id) ->paginate(1), 'return'=>url('v/duplicates'),