From f580e20bc34365068875aa4e9704bfad2119268b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 5 Oct 2017 23:09:02 -0700
Subject: [PATCH] Fixed custom fields filter for advanced search

---
 app/Models/Asset.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 87c8e147ab..cbb623b677 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -815,6 +815,7 @@ class Asset extends Depreciable
     {
         return $query->where(function ($query) use ($filter) {
             foreach ($filter as $key => $search_val) {
+                
                 if ($key =='asset_tag') {
                     $query->where('assets.asset_tag', 'LIKE', '%'.$search_val.'%');
                 }
@@ -914,11 +915,13 @@ class Asset extends Depreciable
             }
 
             foreach (CustomField::all() as $field) {
-                if (array_key_exists($field->db_column_name(), $filter)) {
-                    $query->orWhere($field->db_column_name(), 'LIKE', "%$search_val%");
-                }
+                if (array_key_exists('custom_fields.'.$field->db_column_name(), $filter)) {
+                    $query->orWhere($field->db_column_name(), 'LIKE', '%' . $search_val . '%');
+                } 
             }
+
         });
+
     }