From 1908499379bccada3c93f9f5877ec2bc1dc35ce1 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 13 Jan 2016 07:34:02 -0800
Subject: [PATCH] Fixes #1626 - correctly show deleted models

---
 app/controllers/admin/ModelsController.php | 8 +++++++-
 app/views/backend/hardware/index.blade.php | 2 +-
 app/views/backend/models/index.blade.php   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php
index 9d58ffe39c..e80cb34a3b 100755
--- a/app/controllers/admin/ModelsController.php
+++ b/app/controllers/admin/ModelsController.php
@@ -401,7 +401,13 @@ class ModelsController extends AdminController
     public function getDatatable($status = null)
     {
         $models = Model::with('category','assets','depreciation');
-        ($status != 'Deleted') ?: $models->withTrashed()->Deleted();
+
+        switch ($status) {
+        case 'Deleted':
+          $models->withTrashed()->Deleted();
+          break;
+        }
+
 
         if (Input::has('search')) {
             $models = $models->TextSearch(Input::get('search'));
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
index e8fffe3777..cdda954754 100755
--- a/app/views/backend/hardware/index.blade.php
+++ b/app/views/backend/hardware/index.blade.php
@@ -53,7 +53,7 @@
  {{ Form::open([
       'method' => 'POST',
       'route' => ['hardware/bulkedit'],
-	  'class' => 'form-horizontal' ]) }}
+	    'class' => 'form-horizontal' ]) }}
 
     {{-- <div id="toolbar" class="pull-left" style="padding-top: 10px;">
         <select class="form-control">
diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php
index 3f90113727..373abd1dd7 100755
--- a/app/views/backend/models/index.blade.php
+++ b/app/views/backend/models/index.blade.php
@@ -26,7 +26,7 @@
   <table
   name="models"
   id="table"
-  data-url="{{route('api.models.list')}}"
+  data-url="{{route('api.models.list',array('status'=>Input::get('status')))}}"
   data-cookie="true"
   data-click-to-select="true"
   data-cookie-id-table="modelsTable-{{ Config::get('version.hash_version') }}">