From 9087c5189f1fa7ae828afe2fcff558367dca3de9 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Sat, 5 Oct 2024 09:23:14 +1000
Subject: [PATCH] Added submit page navigation, and preserve list if used

---
 app/Traits/Multimedia.php                         | 4 ++--
 resources/views/catalog/deletereview.blade.php    | 8 ++++++--
 resources/views/catalog/duplicatereview.blade.php | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/Traits/Multimedia.php b/app/Traits/Multimedia.php
index ac27afd..c72bf4d 100644
--- a/app/Traits/Multimedia.php
+++ b/app/Traits/Multimedia.php
@@ -38,7 +38,7 @@ trait Multimedia
 		return redirect()
 			->action(
 				[$this->controller($request->input('type')),'deletes'],
-				['page'=>$request->input('page')]
+				array_filter(['page'=>$request->input('page'),'list'=>$request->input('list')])
 			);
 	}
 
@@ -50,7 +50,7 @@ trait Multimedia
 		return redirect()
 			->action(
 				[$this->controller($request->input('type')),'duplicates'],
-				['page'=>$request->input('page')]
+				array_filter(['page'=>$request->input('page'),'list'=>$request->input('list')])
 			);
 	}
 
diff --git a/resources/views/catalog/deletereview.blade.php b/resources/views/catalog/deletereview.blade.php
index 44afc44..071138b 100644
--- a/resources/views/catalog/deletereview.blade.php
+++ b/resources/views/catalog/deletereview.blade.php
@@ -24,12 +24,16 @@
 			<form action="{{ $return }}" method="POST">
 				@csrf
 
-				<input type="hidden" name="page" value="{{ $catalog->hasMorePages() ? $catalog->currentPage() : NULL }}">
 				<input type="hidden" name="type" value="{{ $type }}">
+				<input type="hidden" name="list" value="{{ request()->get('list') }}">
 
 				@include('catalog.widgets.list')
 
-				<div class="pb-2"><button class="btn btn-sm btn-danger">Confirm Delete</button></div>
+				<div class="pb-2">
+					<button class="btn btn-sm btn-outline-danger" name="page" value="{{ $catalog->hasMorePages() ? $catalog->currentPage() : NULL }}">Confirm Delete <small>[Same]</small></button>
+					<button class="btn btn-sm btn-danger" name="page" value="{{ $catalog->hasMorePages() ? $catalog->currentPage()+1 : NULL }}">Confirm Delete <small>[Advance]</small></button>
+					<button class="btn btn-sm btn-outline-danger" name="page" value="{{ $catalog->hasMorePages() ? 1 : NULL }}">Confirm Delete <small>[1st]</small></button>
+				</div>
 			</form>
 		@else
 			NONE!
diff --git a/resources/views/catalog/duplicatereview.blade.php b/resources/views/catalog/duplicatereview.blade.php
index a80b26c..18f9432 100644
--- a/resources/views/catalog/duplicatereview.blade.php
+++ b/resources/views/catalog/duplicatereview.blade.php
@@ -24,12 +24,12 @@
 			<form action="{{ $return }}" method="POST">
 				@csrf
 
-				<input type="hidden" name="page" value="{{ $catalog->hasMorePages() ? $catalog->currentPage()+1 : NULL }}">
 				<input type="hidden" name="type" value="{{ $type }}">
+				<input type="hidden" name="list" value="{{ request()->get('list') }}">
 
 				@include('catalog.widgets.list')
 
-				<div class="pb-2"><button class="btn btn-sm btn-primary">Update</button></div>
+				<div class="pb-2"><button class="btn btn-sm btn-outline-primary" name="page" value="{{ $catalog->hasMorePages() ? $catalog->currentPage() : NULL }}">Update <small>[Same]</small></button> <button class="btn btn-sm btn-primary" name="page" value="{{ $catalog->hasMorePages() ? $catalog->currentPage()+1 : NULL }}">Update <small>[Advance]</small></button></div>
 			</form>
 		@else
 			NONE!