From 6dd4282f1f461cccb7d1d514297f7d5f35ec9757 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 3 Oct 2017 17:53:08 -0700
Subject: [PATCH] Fixes #4130 - show deleted asset models

---
 app/Http/Controllers/Api/AssetModelsController.php | 6 +++++-
 app/Http/Transformers/AssetModelsTransformer.php   | 8 +++++---
 resources/views/models/index.blade.php             | 4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php
index 7ef076710c..d4b66041a3 100644
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -31,7 +31,7 @@ class AssetModelsController extends Controller
         $this->authorize('view', AssetModel::class);
         $allowed_columns = ['id','image','name','model_number','eol','notes','created_at','manufacturer'];
 
-        $assetmodels = AssetModel::select(['models.id','models.image','models.name','model_number','eol','models.notes','models.created_at','category_id','manufacturer_id','depreciation_id','fieldset_id'])
+        $assetmodels = AssetModel::select(['models.id','models.image','models.name','model_number','eol','models.notes','models.created_at','category_id','manufacturer_id','depreciation_id','fieldset_id', 'models.deleted_at'])
             ->with('category','depreciation', 'manufacturer','fieldset')
             ->withCount('assets');
 
@@ -39,6 +39,10 @@ class AssetModelsController extends Controller
             $assetmodels->TextSearch($request->input('search'));
         }
 
+        if ($request->has('status')) {
+            $assetmodels->onlyTrashed();
+        }
+
 
         $offset = $request->input('offset', 0);
         $limit = $request->input('limit', 50);
diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php
index 2b06e6c0be..53f5997ed6 100644
--- a/app/Http/Transformers/AssetModelsTransformer.php
+++ b/app/Http/Transformers/AssetModelsTransformer.php
@@ -47,13 +47,15 @@ class AssetModelsTransformer
             'notes' => e($assetmodel->notes),
             'created_at' => Helper::getFormattedDateObject($assetmodel->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($assetmodel->updated_at, 'datetime'),
+            'deleted_at' => Helper::getFormattedDateObject($assetmodel->deleted_at, 'datetime'),
 
         ];
 
         $permissions_array['available_actions'] = [
-            'update' => Gate::allows('update', AssetModel::class) ? true : false,
-            'delete' => Gate::allows('delete', AssetModel::class) ? true : false,
-            'clone' => Gate::allows('create', AssetModel::class) ? true : false,
+            'update' => (Gate::allows('update', AssetModel::class) && ($assetmodel->deleted_at==''))  ? true : false,
+            'delete' => (Gate::allows('delete', AssetModel::class) && ($assetmodel->deleted_at=='')) ? true : false,
+            'clone' => (Gate::allows('create', AssetModel::class) && ($assetmodel->deleted_at=='')) ,
+            'restore' => (Gate::allows('create', AssetModel::class) && ($assetmodel->deleted_at!='')) ? true : false,
         ];
 
         $array += $permissions_array;
diff --git a/resources/views/models/index.blade.php b/resources/views/models/index.blade.php
index b9b65629c8..4cd54d9275 100755
--- a/resources/views/models/index.blade.php
+++ b/resources/views/models/index.blade.php
@@ -9,7 +9,7 @@
 {{-- Page title --}}
 @section('header_right')
   <a href="{{ route('models.create') }}" class="btn btn-primary pull-right"></i> {{ trans('general.create') }}</a>
-  <a href="{{ url('hardware/models?status=Deleted') }}" class="btn btn-default pull-right" style="margin-right:5px;"><i class="fa fa-trash"></i>  {{ trans('admin/models/general.view_deleted') }}</a>
+  <a href="{{ route('models.index', ['status' => 'Deleted']) }}" class="btn btn-default pull-right" style="margin-right:5px;"><i class="fa fa-trash"></i>  {{ trans('admin/models/general.view_deleted') }}</a>
 @stop
 
 
@@ -41,7 +41,7 @@
         name="models"
         class="table table-striped snipe-table"
         id="table"
-        data-url="{{ route('api.models.index') }}"
+        data-url="{{ route('api.models.index', ['status'=> e(Input::get('status'))]) }}"
         data-cookie="true"
         data-click-to-select="true"
         data-cookie-id-table="modelsTable-{{ config('version.hash_version') }}">