Fixes #17457 Previous Page redirect option

app/Helpers/Helper.php

@@ -1543,11 +1543,6 @@ static public function getRedirectOption($request, $id, $table, $item_id = null)
 
        // return to previous page
         if ($redirect_option === 'back') {
-            if ($backUrl === route('home')) {
-                return redirect()->to($backUrl)
-                ->with('warning', trans('general.page_error'));
-             }
-
             return redirect()->to($backUrl);
         }
 

app/Http/Controllers/Accessories/AccessoriesController.php

@@ -90,7 +90,12 @@ public function store(ImageUploadRequest $request) : RedirectResponse
             $accessory = $request->handleImages($accessory);
         }
 
-        session()->put(['redirect_option' => $request->get('redirect_option')]);
+        if($request->get('redirect_option') === 'back'){
+            session()->put(['redirect_option' => 'index']);
+        } else {
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+        }
+
         // Was the accessory created?
         if ($accessory->save()) {
             // Redirect to the new accessory  page

app/Http/Controllers/Assets/AssetsController.php

@@ -234,9 +234,13 @@ public function store(ImageUploadRequest $request) : RedirectResponse
                 $failures[] = join(",", $asset->getErrors()->all());
             }
         }
+        if($request->get('redirect_option') === 'back'){
+            session()->put(['redirect_option' => 'index']);
+        } else {
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+        }
 
-        session()->put(['redirect_option' => $request->get('redirect_option'),
-                       'checkout_to_type' => $request->get('checkout_to_type'),
+        session()->put(['checkout_to_type' => $request->get('checkout_to_type'),
                        'other_redirect' =>  'model' ]);
 
 

app/Http/Controllers/Components/ComponentsController.php

@@ -88,7 +88,12 @@ public function store(ImageUploadRequest $request)
 
         $component = $request->handleImages($component);
 
-        session()->put(['redirect_option' => $request->get('redirect_option')]);
+        if($request->get('redirect_option') === 'back'){
+            session()->put(['redirect_option' => 'index']);
+        } else {
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+        }
+
 
         if ($component->save()) {
             return Helper::getRedirectOption($request, $component->id, 'Components')

app/Http/Controllers/Consumables/ConsumablesController.php

@@ -98,7 +98,12 @@ public function store(StoreConsumableRequest $request)
             $consumable = $request->handleImages($consumable);
         }
 
-        session()->put(['redirect_option' => $request->get('redirect_option')]);
+        if($request->get('redirect_option') === 'back'){
+            session()->put(['redirect_option' => 'index']);
+        } else {
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+        }
+
 
         if ($consumable->save()) {
             return Helper::getRedirectOption($request, $consumable->id, 'Consumables')

app/Http/Controllers/Licenses/LicensesController.php

@@ -102,7 +102,11 @@ public function store(Request $request)
         $license->created_by           = auth()->id();
         $license->min_amt           = $request->input('min_amt');
 
-        session()->put(['redirect_option' => $request->get('redirect_option')]);
+        if($request->get('redirect_option') === 'back'){
+            session()->put(['redirect_option' => 'index']);
+        } else {
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+        }
 
         if ($license->save()) {
             return Helper::getRedirectOption($request, $license->id, 'Licenses')

app/Http/Controllers/Users/UsersController.php

@@ -126,7 +126,12 @@ public function store(SaveUserRequest $request)
         // we have to invoke the form request here to handle image uploads
         app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
-        session()->put(['redirect_option' => $request->get('redirect_option')]);
+        if($request->get('redirect_option') === 'back'){
+            session()->put(['redirect_option' => 'index']);
+        } else {
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+        }
+
 
         if ($user->save()) {
             if ($request->filled('groups')) {

resources/views/accessories/edit.blade.php

@@ -6,6 +6,7 @@
     'formAction' => (isset($item->id)) ? route('accessories.update', ['accessory' => $item->id]) : route('accessories.store'),
     'index_route' => 'accessories.index',
     'options' => [
+                'back' => trans('admin/hardware/form.redirect_to_type',['type' => trans('general.previous_page')]),
                 'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'accessories']),
                 'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.accessory')]),
                ]