From 3695e118f416c66e3d7dda9c1cbb76118994c08d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 2 Nov 2017 08:06:10 -0700
Subject: [PATCH] Fixed erroneous call to assets.category in filter scope

---
 app/Models/Asset.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 38bc1f3946..eefc8b88ab 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -872,7 +872,7 @@ class Asset extends Depreciable
                 }
 
                 if ($fieldname =='location') {
-                    $query->whereHas('defaultLoc', function ($query) use ($search_val) {
+                    $query->whereHas('location', function ($query) use ($search_val) {
                         $query->where('locations.name', 'LIKE', '%' . $search_val . '%');
                     });
                 }
@@ -935,8 +935,11 @@ class Asset extends Depreciable
                 }
             }
 
+            if ($fieldname!='category') {
+                $query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
+            }
+
 
-            $query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
 
 
         });