From 67315d81d6b010353cea158ad7041a7d1e2e6ebc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Sep 2016 13:28:15 -0700
Subject: [PATCH] Fixes #2134 - hide archived assets from list all

---
 app/Http/Controllers/AssetsController.php |  3 +++
 app/Models/Asset.php                      | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 51d81ec64c..e7512a2530 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -1676,6 +1676,9 @@ class AssetsController extends Controller
             case 'Deployed':
                 $assets->Deployed();
                 break;
+            default:
+                $assets->NotArchived();
+                break;
 
         }
 
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 25c7ba4343..c6b1bb2916 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -628,6 +628,23 @@ public function checkin_email()
         });
     }
 
+    /**
+     * Query builder scope for non-Archived assets
+     *
+     * @param  Illuminate\Database\Query\Builder $query Query builder instance
+     *
+     * @return Illuminate\Database\Query\Builder          Modified query builder
+     */
+
+    public function scopeNotArchived($query)
+    {
+
+        return $query->whereHas('assetstatus', function ($query) {
+
+            $query->where('archived', '=', 0);
+        });
+    }
+
   /**
    * Query builder scope for Archived assets
    *