From f3e49e70102edb9474524106d1b091d673fbb4a1 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 1 Jul 2025 10:43:00 -0700 Subject: [PATCH] add asset model as a redirect option --- app/Helpers/Helper.php | 5 +++++ app/Http/Controllers/Assets/AssetsController.php | 6 +++++- resources/views/hardware/edit.blade.php | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index f544f2bc36..aa8b3a5571 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -1542,6 +1542,11 @@ class Helper case 'audit': return route('assets.audit.due'); } + switch ($other_redirect) { + case 'model': + + return route('models.show', $request->model_id ); + } } diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 03486ffe82..739523b7e9 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -427,8 +427,12 @@ class AssetsController extends Controller } } } + session()->put([ + 'redirect_option' => $request->get('redirect_option'), + 'checkout_to_type' => $request->get('checkout_to_type'), + 'other_redirect' => $request->get('redirect_option') === 'other_redirect' ? 'model' : null, + ]); - session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]); if ($asset->save()) { return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets')) diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 3253e8c5c0..de4fc82b0b 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -10,6 +10,7 @@ 'options' => [ 'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'assets']), 'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset')]), + 'other_redirect' => trans('admin/hardware/form.redirect_to_type', [ 'type' => trans('general.asset').' '.trans('general.asset_model')]) ] ])