From b20c841a890b4c0220f1eb19ed3ff8b88265cf5a Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 4 Oct 2021 19:29:13 -0700 Subject: [PATCH] Fixed asset models restore Signed-off-by: snipe --- app/Http/Controllers/Api/AssetModelsController.php | 2 +- resources/views/models/index.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php index 9bc3e46cfe..95af6fbe5a 100644 --- a/app/Http/Controllers/Api/AssetModelsController.php +++ b/app/Http/Controllers/Api/AssetModelsController.php @@ -67,7 +67,7 @@ class AssetModelsController extends Controller - if ($request->filled('status')) { + if ($request->input('status')=='deleted') { $assetmodels->onlyTrashed(); } diff --git a/resources/views/models/index.blade.php b/resources/views/models/index.blade.php index b1c1dab873..16b2040a4c 100755 --- a/resources/views/models/index.blade.php +++ b/resources/views/models/index.blade.php @@ -69,7 +69,7 @@ data-sort-order="asc" id="asssetModelsTable" class="table table-striped snipe-table" - data-url="{{ route('api.models.index') }}" + data-url="{{ route('api.models.index', ['status' => request('status')]) }}" data-export-options='{ "fileName": "export-models-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]